sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Print non-data stuff (errors, warnings, hints) on stderr.

pull/7/head
Oliver Hartkopp 2008-10-29 09:41:40 +00:00
parent 1be68bcc64
commit 265021e323
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
candump.c
View File

@ -166,7 +166,7 @@ int idx2dindex(int ifidx, int socket) {
break; break;
if (i == MAXIFNAMES) { if (i == MAXIFNAMES) {
printf("Interface index cache only supports %d interfaces.\n", fprintf(stderr, "Interface index cache only supports %d interfaces.\n",
MAXIFNAMES); MAXIFNAMES);
exit(1); exit(1);
} }
@ -242,7 +242,7 @@ int main(int argc, char **argv)
timestamp = optarg[0]; timestamp = optarg[0];
if ((timestamp != 'a') && (timestamp != 'A') && if ((timestamp != 'a') && (timestamp != 'A') &&
(timestamp != 'd') && (timestamp != 'z')) { (timestamp != 'd') && (timestamp != 'z')) {
printf("%s: unknown timestamp mode '%c' - ignored\n", fprintf(stderr, "%s: unknown timestamp mode '%c' - ignored\n",
basename(argv[0]), optarg[0]); basename(argv[0]), optarg[0]);
timestamp = 0; timestamp = 0;
} }
@ -275,7 +275,7 @@ int main(int argc, char **argv)
case 'b': case 'b':
case 'B': case 'B':
if (strlen(optarg) >= IFNAMSIZ) { if (strlen(optarg) >= IFNAMSIZ) {
printf("Name of CAN device '%s' is too long!\n\n", optarg); fprintf(stderr, "Name of CAN device '%s' is too long!\n\n", optarg);
return 1; return 1;
} else { } else {
bridge = socket(PF_CAN, SOCK_RAW, CAN_RAW); bridge = socket(PF_CAN, SOCK_RAW, CAN_RAW);
@ -335,7 +335,7 @@ int main(int argc, char **argv)
if (silent == SILENT_INI) { if (silent == SILENT_INI) {
if (log) { if (log) {
printf("\nDisabled standard output while logging."); fprintf(stderr, "\nDisabled standard output while logging.");
silent = SILENT_ON; /* disable output on stdout */ silent = SILENT_ON; /* disable output on stdout */
} else } else
silent = SILENT_OFF; /* default output */ silent = SILENT_OFF; /* default output */
@ -344,7 +344,7 @@ int main(int argc, char **argv)
currmax = argc - optind; /* find real number of CAN devices */ currmax = argc - optind; /* find real number of CAN devices */
if (currmax > MAXSOCK) { if (currmax > MAXSOCK) {
printf("More than %d CAN devices given on commandline!\n", MAXSOCK); fprintf(stderr, "More than %d CAN devices given on commandline!\n", MAXSOCK);
return 1; return 1;
} }
@ -369,7 +369,7 @@ int main(int argc, char **argv)
nbytes = strlen(ptr); /* no ',' found => no filter definitions */ nbytes = strlen(ptr); /* no ',' found => no filter definitions */
if (nbytes >= IFNAMSIZ) { if (nbytes >= IFNAMSIZ) {
printf("name of CAN device '%s' is too long!\n", ptr); fprintf(stderr, "name of CAN device '%s' is too long!\n", ptr);
return 1; return 1;
} }
@ -429,12 +429,12 @@ int main(int argc, char **argv)
numfilter++; numfilter++;
} else if (sscanf(ptr, "#%lx", } else if (sscanf(ptr, "#%lx",
(long unsigned int *)&err_mask) != 1) { (long unsigned int *)&err_mask) != 1) {
printf("Error in filter option parsing: '%s'\n", ptr); fprintf(stderr, "Error in filter option parsing: '%s'\n", ptr);
exit(1); exit(1);
} }
if (numfilter > MAXFILTER) { if (numfilter > MAXFILTER) {
printf("Too many filters specified for '%s'.\n", fprintf(stderr, "Too many filters specified for '%s'.\n",
ifr.ifr_name); ifr.ifr_name);
exit(1); exit(1);
} }
@ -478,7 +478,7 @@ int main(int argc, char **argv)
if (silent != SILENT_ON) if (silent != SILENT_ON)
printf("\nWarning: console output active while logging!"); printf("\nWarning: console output active while logging!");
printf("\nEnabling Logfile '%s'\n\n", fname); fprintf(stderr, "\nEnabling Logfile '%s'\n\n", fname);
logfile = fopen(fname, "w"); logfile = fopen(fname, "w");
if (!logfile) { if (!logfile) {