diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 28 | ||||
| -rw-r--r-- | include/unarchive.h | 2 | ||||
| -rw-r--r-- | include/usage.h | 10 |
3 files changed, 24 insertions, 16 deletions
diff --git a/include/libbb.h b/include/libbb.h index 3c563a96f..b94586165 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -60,10 +60,6 @@ #define PATH_MAX 256 #endif -#ifdef DMALLOC -#include <dmalloc.h> -#endif - /* Some useful definitions */ #undef FALSE #define FALSE ((int) 0) @@ -211,7 +207,9 @@ extern int bb_fprintf(FILE * __restrict stream, const char * __restrict format, extern int bb_printf(const char * __restrict format, ...) __attribute__ ((format (printf, 1, 2))); -//#warning rename to xferror_filename? +#if ENABLE_NITPICK +#warning rename to xferror_filename? +#endif extern void xferror(FILE *fp, const char *fn); extern void xferror_stdout(void); extern void xfflush_stdout(void); @@ -265,7 +263,9 @@ extern long bb_xgetlarg_bnd_sfx(const char *arg, int base, extern long bb_xgetlarg10_sfx(const char *arg, const struct suffix_mult *suffixes); -//#warning pitchable now? +#if ENABLE_NITPICK +#warning pitchable now? +#endif extern unsigned long bb_xparse_number(const char *numstr, const struct suffix_mult *suffixes); @@ -330,7 +330,9 @@ char *concat_path_file(const char *path, const char *filename); char *concat_subpath_file(const char *path, const char *filename); char *last_char_is(const char *s, int c); -//#warning yuk! +#if ENABLE_NITPICK +#warning yuk! +#endif char *fgets_str(FILE *file, const char *terminating_string); extern int uncompress(int fd_in, int fd_out); @@ -344,7 +346,9 @@ extern int xconnect(struct sockaddr_in *s_addr); extern unsigned short bb_lookup_port(const char *port, const char *protocol, unsigned short default_port); extern void bb_lookup_host(struct sockaddr_in *s_in, const char *host); -//#warning wrap this? +#if ENABLE_NITPICK +#warning wrap this? +#endif char *dirname (char *path); int bb_make_directory (char *path, long mode, int flags); @@ -456,8 +460,10 @@ extern int bb_default_error_retval; # define FB_0 "/dev/fb0" #endif -//#warning put these in .o files +#if ENABLE_NITPICK +#warning put these in .o files +#endif /* The following devices are the same on devfs and non-devfs systems. */ #define CURRENT_TTY "/dev/tty" #define CONSOLE_DEV "/dev/console" @@ -581,4 +587,8 @@ extern const char BB_BANNER[]; #undef isupper #undef isxdigit +#ifdef DMALLOC +#include <dmalloc.h> +#endif + #endif /* __LIBBUSYBOX_H__ */ diff --git a/include/unarchive.h b/include/unarchive.h index 05ab0c16a..1dbbc009d 100644 --- a/include/unarchive.h +++ b/include/unarchive.h @@ -10,8 +10,6 @@ #define ARCHIVE_NOPRESERVE_OWN 32 #define ARCHIVE_NOPRESERVE_PERM 64 -#include <sys/types.h> -#include <stdio.h> #include "libbb.h" typedef struct file_headers_s { diff --git a/include/usage.h b/include/usage.h index ced9f68c7..0f95708c5 100644 --- a/include/usage.h +++ b/include/usage.h @@ -1426,12 +1426,12 @@ USE_FEATURE_DATE_ISOFMT( \ #define ipcrm_trivial_usage \ "[-[MQS] key] [-[mqs] id]" #define ipcrm_full_usage \ - "The upper-case options MQS are used to remove a shared memory\n" \ - "segment by an shmkey value. The lower-case options mqs are used\n" \ + "The upper-case options MQS are used to remove a shared memory segment by a\n" \ + "segment by a shmkey value. The lower-case options mqs are used\n" \ "to remove a segment by shmid value.\n" \ - "\t-m | -M\tRemove the memory segment after the last detach\n" \ - "\t-q | -Q\tRemove the message queue\n" \ - "\t-s | -S\tRemove the semaphore" + "\t-[mM]\tRemove the memory segment after the last detach\n" \ + "\t-[qQ]\tRemove the message queue\n" \ + "\t-[sS]\tRemove the semaphore" #define ipcs_trivial_usage \ "[[-smq] -i shmid] | [[-asmq] [-tclup]]" |