Skip to content

Commit 63c8643

Browse files
acassisxiaoxiang781216
authored andcommitted
apps/can: Replace fprintf with dprint
This modification will remove the dependency on CONFIG_FILE_STREAM, useful for small devices. Signed-off-by: Alan C. Assis <acassis@gmail.com>
1 parent c7b395e commit 63c8643

File tree

1 file changed

+16
-23
lines changed

1 file changed

+16
-23
lines changed

examples/can/can_main.c

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105

106106
static void show_usage(FAR const char *progname)
107107
{
108-
fprintf(stderr, "USAGE: %s"
108+
dprintf(STDERR_FILENO, "USAGE: %s"
109109
" [-n <nmsgs]"
110110
#ifdef CONFIG_EXAMPLES_CAN_WRITE
111111
#ifdef CONFIG_CAN_EXTID
@@ -118,24 +118,24 @@ static void show_usage(FAR const char *progname)
118118
#endif
119119
"\n",
120120
progname);
121-
fprintf(stderr, "USAGE: %s -h\n",
121+
dprintf(STDERR_FILENO, "USAGE: %s -h\n",
122122
progname);
123-
fprintf(stderr, "\nWhere:\n");
124-
fprintf(stderr,
123+
dprintf(STDERR_FILENO, "\nWhere:\n");
124+
dprintf(STDERR_FILENO,
125125
"-n <nmsgs>: The number of messages to send. Default: 32\n");
126126
#ifdef CONFIG_EXAMPLES_CAN_WRITE
127127
#ifdef CONFIG_CAN_EXTID
128-
fprintf(stderr, "-s: Use standard IDs. Default: Extended ID\n");
128+
dprintf(STDERR_FILENO, "-s: Use standard IDs. Default: Extended ID\n");
129129
#endif
130130
#ifdef CONFIG_CAN_FD
131-
fprintf(stderr, "-e: Use extended data length without bit rate switch. "
132-
"Default: bit rate switch enabled\n");
131+
dprintf(STDERR_FILENO, "-e: Use extended data length without bit rate "
132+
"switch. Default: bit rate switch enabled\n");
133133
#endif
134-
fprintf(stderr, "-a <min-id>: The start message id. Default 1\n");
135-
fprintf(stderr, "-b <max-id>: The start message id. Default %d\n",
134+
dprintf(STDERR_FILENO, "-a <min-id>: The start message id. Default 1\n");
135+
dprintf(STDERR_FILENO, "-b <max-id>: The start message id. Default %d\n",
136136
MAX_ID);
137137
#endif
138-
fprintf(stderr, "-h: Show this message and exit\n");
138+
dprintf(STDERR_FILENO, "-h: Show this message and exit\n");
139139
}
140140

141141
/****************************************************************************
@@ -213,7 +213,7 @@ int main(int argc, FAR char *argv[])
213213
minid = strtol(optarg, NULL, 10);
214214
if (minid < 1 || minid > maxid)
215215
{
216-
fprintf(stderr, "<min-id> out of range\n");
216+
dprintf(STDERR_FILENO, "<min-id> out of range\n");
217217
badarg = true;
218218
}
219219
break;
@@ -222,7 +222,7 @@ int main(int argc, FAR char *argv[])
222222
maxid = strtol(optarg, NULL, 10);
223223
if (maxid < minid || maxid > MAX_ID)
224224
{
225-
fprintf(stderr, "ERROR: <max-id> out of range\n");
225+
dprintf(STDERR_FILENO, "ERROR: <max-id> out of range\n");
226226
badarg = true;
227227
}
228228
break;
@@ -236,19 +236,19 @@ int main(int argc, FAR char *argv[])
236236
nmsgs = strtol(optarg, NULL, 10);
237237
if (nmsgs < 1)
238238
{
239-
fprintf(stderr, "ERROR: <nmsgs> out of range\n");
239+
dprintf(STDERR_FILENO, "ERROR: <nmsgs> out of range\n");
240240
badarg = true;
241241
}
242242
break;
243243

244244
case ':':
245-
fprintf(stderr, "ERROR: Bad option argument\n");
245+
dprintf(STDERR_FILENO, "ERROR: Bad option argument\n");
246246
badarg = true;
247247
break;
248248

249249
case '?':
250250
default:
251-
fprintf(stderr, "ERROR: Unrecognized option\n");
251+
dprintf(STDERR_FILENO, "ERROR: Unrecognized option\n");
252252
badarg = true;
253253
break;
254254
}
@@ -279,7 +279,7 @@ int main(int argc, FAR char *argv[])
279279

280280
if (optind != argc)
281281
{
282-
fprintf(stderr, "ERROR: Garbage on command line\n");
282+
dprintf(STDERR_FILENO, "ERROR: Garbage on command line\n");
283283
show_usage(argv[0]);
284284
return EXIT_FAILURE;
285285
}
@@ -334,12 +334,6 @@ int main(int argc, FAR char *argv[])
334334

335335
for (msgno = 0; !nmsgs || msgno < nmsgs; msgno++)
336336
{
337-
/* Flush any output before the loop entered or from the previous pass
338-
* through the loop.
339-
*/
340-
341-
fflush(stdout);
342-
343337
#ifdef CONFIG_EXAMPLES_CAN_WRITE
344338

345339
/* Construct the next TX message */
@@ -525,6 +519,5 @@ int main(int argc, FAR char *argv[])
525519
close(fd);
526520

527521
printf("Terminating!\n");
528-
fflush(stdout);
529522
return errval;
530523
}

0 commit comments

Comments
 (0)