riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16219 from chrysn-pull-requests/saul-shell-no-null-percents

Browse Source 
sys/shell/saul: Don't print from NULL
This commit is contained in:
chrysn 2021-03-23 19:11:43 +01:00 committed by GitHub
commit 5b44d7e5b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/shell/commands/sc_saul_reg.c
View File

@ -26,6 +26,14 @@
#include "saul_reg.h" #include "saul_reg.h"
static const char *_devname(saul_reg_t *dev) {
if (dev->name == NULL) {
return "(no name)";
} else {
return dev->name;
}
}
/* this function does not check, if the given device is valid */ /* this function does not check, if the given device is valid */
static void probe(int num, saul_reg_t *dev) static void probe(int num, saul_reg_t *dev)
{ {
@ -38,7 +46,7 @@ static void probe(int num, saul_reg_t *dev)
return; return;
} }
/* print results */ /* print results */
printf("Reading from #%i (%s|%s)\n", num, dev->name, printf("Reading from #%i (%s|%s)\n", num, _devname(dev),
saul_class_to_str(dev->driver->type)); saul_class_to_str(dev->driver->type));
phydat_dump(&res, dim); phydat_dump(&res, dim);
} }
@ -68,7 +76,7 @@ static void list(void)
} }
while (dev) { while (dev) {
printf("#%i\t%s\t%s\n", printf("#%i\t%s\t%s\n",
i++, saul_class_to_str(dev->driver->type), dev->name); i++, saul_class_to_str(dev->driver->type), _devname(dev));
dev = dev->next; dev = dev->next;
} }
} }
@ -120,7 +128,7 @@ static void write(int argc, char **argv)
data.val[i] = atoi(argv[i + 3]); data.val[i] = atoi(argv[i + 3]);
} }
/* print values before writing */ /* print values before writing */
printf("Writing to device #%i - %s\n", num, dev->name); printf("Writing to device #%i - %s\n", num, _devname(dev));
phydat_dump(&data, dim); phydat_dump(&data, dim);
/* write values to device */ /* write values to device */
dim = saul_reg_write(dev, &data); dim = saul_reg_write(dev, &data);