random small shrinkage and elimination of statics

This commit is contained in:
Denis Vlasenko 2007-04-07 00:44:31 +00:00
parent 19507f0869
commit 04c99ebb4f
4 changed files with 8 additions and 7 deletions

View File

@ -23,9 +23,9 @@ char get_header_ar(archive_handle_t *archive_handle)
char magic[2]; char magic[2];
} formatted; } formatted;
} ar; } ar;
#ifdef CONFIG_FEATURE_AR_LONG_FILENAMES #if ENABLE_FEATURE_AR_LONG_FILENAMES
static char *ar_long_names; static char *ar_long_names;
static unsigned int ar_long_name_size; static unsigned ar_long_name_size;
#endif #endif
/* dont use xread as we want to handle the error ourself */ /* dont use xread as we want to handle the error ourself */

View File

@ -604,7 +604,7 @@ enum {
LOGMODE_BOTH = LOGMODE_SYSLOG + LOGMODE_STDIO, LOGMODE_BOTH = LOGMODE_SYSLOG + LOGMODE_STDIO,
}; };
extern const char *msg_eol; extern const char *msg_eol;
extern int logmode; extern smallint logmode;
extern int die_sleep; extern int die_sleep;
extern int xfunc_error_retval; extern int xfunc_error_retval;
extern void sleep_and_die(void) ATTRIBUTE_NORETURN; extern void sleep_and_die(void) ATTRIBUTE_NORETURN;

View File

@ -10,7 +10,7 @@
#include "libbb.h" #include "libbb.h"
#include <syslog.h> #include <syslog.h>
int logmode = LOGMODE_STDIO; smallint logmode = LOGMODE_STDIO;
const char *msg_eol = "\n"; const char *msg_eol = "\n";
void bb_verror_msg(const char *s, va_list p, const char* strerr) void bb_verror_msg(const char *s, va_list p, const char* strerr)

View File

@ -19,7 +19,7 @@ typedef struct identd_buf_t {
char buf[64 - 2*sizeof(int)]; char buf[64 - 2*sizeof(int)];
} identd_buf_t; } identd_buf_t;
static const char *bogouser = "nobody"; #define bogouser bb_common_bufsiz1
static int new_peer(isrv_state_t *state, int fd) static int new_peer(isrv_state_t *state, int fd)
{ {
@ -108,8 +108,9 @@ int fakeidentd_main(int argc, char **argv)
int fd; int fd;
opt = getopt32(argc, argv, "fiwb:", &bind_address); opt = getopt32(argc, argv, "fiwb:", &bind_address);
if (optind < argc) strcpy(bogouser, "nobody");
bogouser = argv[optind]; if (argv[optind])
strncpy(bogouser, argv[optind], sizeof(bogouser));
/* Daemonize if no -f and no -i and no -w */ /* Daemonize if no -f and no -i and no -w */
if (!(opt & OPT_fiw)); if (!(opt & OPT_fiw));