[patch] remove unnecessary warning from libbb.h [was: Re: warnings in libbb.h]

Bernhard Fischer rep.nop at aon.at
Sat Sep 17 22:10:02 UTC 2005


On Sun, Sep 11, 2005 at 06:28:43PM -0400, Mike Frysinger wrote:
>On Sunday 11 September 2005 05:15 pm, Bernhard Fischer wrote:
>> //#warning rename?
>> extern int   bb_fclose_nonstdin(FILE *f);
>>
>> s/_nonstdin// ?
>
>i think the current name is correct ... it does afterall check to see if *f is 
>not stdin, so renaming it w/out removing the check would change its purpose

Ok.
>
>> //#warning rename?
>> extern FILE *bb_wfopen_input(const char *filename);
>
>we have a bb_wfopen and a bb_wfopen_input so renaming it doesnt make sense

Ok. Moved the bb_wfopen_input near bb_wfopen to make that explicit.

Proposed changelog:
Remove unnecessary warnings from libbb.h (and thus make busybox a bit
more ISO C 90 friendly, fwiw).


not tested as it's obvious. Please apply,
Bernhard
-------------- next part --------------
diff -X excl -rduNp busybox.oorig/include/libbb.h busybox/include/libbb.h
--- busybox.oorig/include/libbb.h	2005-09-17 23:46:12.000000000 +0200
+++ busybox/include/libbb.h	2005-09-18 00:02:56.000000000 +0200
@@ -144,9 +144,9 @@ extern int   bb_xprint_file_by_name(cons
 extern char  bb_process_escape_sequence(const char **ptr);
 extern char *bb_get_last_path_component(char *path);
 extern FILE *bb_wfopen(const char *path, const char *mode);
+extern FILE *bb_wfopen_input(const char *filename);
 extern FILE *bb_xfopen(const char *path, const char *mode);
 
-//#warning rename?
 extern int   bb_fclose_nonstdin(FILE *f);
 extern void  bb_fflush_stdout_and_exit(int retval) __attribute__ ((noreturn));
 
@@ -155,9 +155,6 @@ extern const char *bb_opt_complementally
 extern const struct option *bb_applet_long_options;
 extern unsigned long bb_getopt_ulflags(int argc, char **argv, const char *applet_opts, ...);
 
-//#warning rename?
-extern FILE *bb_wfopen_input(const char *filename);
-
 extern int bb_vfprintf(FILE * __restrict stream, const char * __restrict format,
 					   va_list arg) __attribute__ ((format (printf, 2, 0)));
 extern int bb_vprintf(const char * __restrict format, va_list arg)


More information about the busybox mailing list