emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from Bernhard Fischer to make a bunch of symbols static

Browse Source 
which were otherwise cluttering the global namespace.
This commit is contained in:
Eric Andersen 2005-04-16 19:39:00 +00:00
parent a77b4f3970
commit 14f5c8d764
30 changed files with 96 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
archival/dpkg.c
View File

@ -58,7 +58,7 @@
* I estimate it should be at least 50% bigger than PACKAGE_HASH_PRIME, * I estimate it should be at least 50% bigger than PACKAGE_HASH_PRIME,
* as there a lot of duplicate version numbers */ * as there a lot of duplicate version numbers */
#define NAME_HASH_PRIME 16381 #define NAME_HASH_PRIME 16381
char *name_hashtable[NAME_HASH_PRIME + 1]; static char *name_hashtable[NAME_HASH_PRIME + 1];
/* PACKAGE_HASH_PRIME, Maximum number of unique packages, /* PACKAGE_HASH_PRIME, Maximum number of unique packages,
* It must not be smaller than STATUS_HASH_PRIME, * It must not be smaller than STATUS_HASH_PRIME,
@ -82,7 +82,7 @@ typedef struct common_node_s {
unsigned int num_of_edges:14; unsigned int num_of_edges:14;
edge_t **edge; edge_t **edge;
} common_node_t; } common_node_t;
common_node_t *package_hashtable[PACKAGE_HASH_PRIME + 1]; static common_node_t *package_hashtable[PACKAGE_HASH_PRIME + 1];
/* Currently it doesnt store packages that have state-status of not-installed /* Currently it doesnt store packages that have state-status of not-installed
* So it only really has to be the size of the maximum number of packages * So it only really has to be the size of the maximum number of packages
@ -92,7 +92,7 @@ typedef struct status_node_s {
unsigned int package:14; /* has to fit PACKAGE_HASH_PRIME */ unsigned int package:14; /* has to fit PACKAGE_HASH_PRIME */
unsigned int status:14; /* has to fit STATUS_HASH_PRIME */ unsigned int status:14; /* has to fit STATUS_HASH_PRIME */
} status_node_t; } status_node_t;
status_node_t *status_hashtable[STATUS_HASH_PRIME + 1]; static status_node_t *status_hashtable[STATUS_HASH_PRIME + 1];
/* Even numbers are for 'extras', like ored dependencies or null */ /* Even numbers are for 'extras', like ored dependencies or null */
enum edge_type_e { enum edge_type_e {
@ -137,7 +137,7 @@ typedef struct deb_file_s {
} deb_file_t; } deb_file_t;
void make_hash(const char *key, unsigned int *start, unsigned int *decrement, const int hash_prime) static void make_hash(const char *key, unsigned int *start, unsigned int *decrement, const int hash_prime)
{ {
unsigned long int hash_num = key[0]; unsigned long int hash_num = key[0];
int len = strlen(key); int len = strlen(key);
@ -157,7 +157,7 @@ void make_hash(const char *key, unsigned int *start, unsigned int *decrement, co
} }
/* this adds the key to the hash table */ /* this adds the key to the hash table */
int search_name_hashtable(const char *key) static int search_name_hashtable(const char *key)
{ {
unsigned int probe_address = 0; unsigned int probe_address = 0;
unsigned int probe_decrement = 0; unsigned int probe_decrement = 0;
@ -181,7 +181,7 @@ int search_name_hashtable(const char *key)
/* this DOESNT add the key to the hashtable /* this DOESNT add the key to the hashtable
* TODO make it consistent with search_name_hashtable * TODO make it consistent with search_name_hashtable
*/ */
unsigned int search_status_hashtable(const char *key) static unsigned int search_status_hashtable(const char *key)
{ {
unsigned int probe_address = 0; unsigned int probe_address = 0;
unsigned int probe_decrement = 0; unsigned int probe_decrement = 0;
@ -201,7 +201,7 @@ unsigned int search_status_hashtable(const char *key)
} }
/* Need to rethink version comparison, maybe the official dpkg has something i can use ? */ /* Need to rethink version comparison, maybe the official dpkg has something i can use ? */
int version_compare_part(const char *version1, const char *version2) static int version_compare_part(const char *version1, const char *version2)
{ {
int upstream_len1 = 0; int upstream_len1 = 0;
int upstream_len2 = 0; int upstream_len2 = 0;
@ -268,7 +268,7 @@ cleanup_version_compare_part:
* if ver1 = ver2 return 0, * if ver1 = ver2 return 0,
* if ver1 > ver2 return 1, * if ver1 > ver2 return 1,
*/ */
int version_compare(const unsigned int ver1, const unsigned int ver2) static int version_compare(const unsigned int ver1, const unsigned int ver2)
{ {
char *ch_ver1 = name_hashtable[ver1]; char *ch_ver1 = name_hashtable[ver1];
char *ch_ver2 = name_hashtable[ver2]; char *ch_ver2 = name_hashtable[ver2];
@ -330,7 +330,7 @@ int version_compare(const unsigned int ver1, const unsigned int ver2)
return(version_compare_part(deb_ver1, deb_ver2)); return(version_compare_part(deb_ver1, deb_ver2));
} }
int test_version(const unsigned int version1, const unsigned int version2, const unsigned int operator) static int test_version(const unsigned int version1, const unsigned int version2, const unsigned int operator)
{ {
const int version_result = version_compare(version1, version2); const int version_result = version_compare(version1, version2);
switch(operator) { switch(operator) {
@ -366,7 +366,7 @@ int test_version(const unsigned int version1, const unsigned int version2, const
} }
int search_package_hashtable(const unsigned int name, const unsigned int version, const unsigned int operator) static int search_package_hashtable(const unsigned int name, const unsigned int version, const unsigned int operator)
{ {
unsigned int probe_address = 0; unsigned int probe_address = 0;
unsigned int probe_decrement = 0; unsigned int probe_decrement = 0;
@ -405,7 +405,7 @@ int search_package_hashtable(const unsigned int name, const unsigned int version
* FIXME: I don't think this is very efficient, but I thought I'd keep * FIXME: I don't think this is very efficient, but I thought I'd keep
* it simple for now until it proves to be a problem. * it simple for now until it proves to be a problem.
*/ */
int search_for_provides(int needle, int start_at) { static int search_for_provides(int needle, int start_at) {
int i, j; int i, j;
common_node_t *p; common_node_t *p;
for (i = start_at + 1; i < PACKAGE_HASH_PRIME; i++) { for (i = start_at + 1; i < PACKAGE_HASH_PRIME; i++) {
@ -421,7 +421,7 @@ int search_for_provides(int needle, int start_at) {
/* /*
* Add an edge to a node * Add an edge to a node
*/ */
void add_edge_to_node(common_node_t *node, edge_t *edge) static void add_edge_to_node(common_node_t *node, edge_t *edge)
{ {
node->num_of_edges++; node->num_of_edges++;
node->edge = xrealloc(node->edge, sizeof(edge_t) * (node->num_of_edges + 1)); node->edge = xrealloc(node->edge, sizeof(edge_t) * (node->num_of_edges + 1));
@ -438,7 +438,7 @@ void add_edge_to_node(common_node_t *node, edge_t *edge)
* field contains the number of EDGE nodes which follow as part of * field contains the number of EDGE nodes which follow as part of
* this alternative. * this alternative.
*/ */
void add_split_dependencies(common_node_t *parent_node, const char *whole_line, unsigned int edge_type) static void add_split_dependencies(common_node_t *parent_node, const char *whole_line, unsigned int edge_type)
{ {
char *line = bb_xstrdup(whole_line); char *line = bb_xstrdup(whole_line);
char *line2; char *line2;
@ -537,7 +537,7 @@ void add_split_dependencies(common_node_t *parent_node, const char *whole_line,
return; return;
} }
void free_package(common_node_t *node) static void free_package(common_node_t *node)
{ {
unsigned short i; unsigned short i;
if (node) { if (node) {
@ -550,7 +550,7 @@ void free_package(common_node_t *node)
} }
} }
unsigned int fill_package_struct(char *control_buffer) static unsigned int fill_package_struct(char *control_buffer)
{ {
common_node_t *new_node = (common_node_t *) xcalloc(1, sizeof(common_node_t)); common_node_t *new_node = (common_node_t *) xcalloc(1, sizeof(common_node_t));
const char *field_names[] = { "Package", "Version", "Pre-Depends", "Depends", const char *field_names[] = { "Package", "Version", "Pre-Depends", "Depends",
@ -624,7 +624,7 @@ fill_package_struct_cleanup:
} }
/* if num = 1, it returns the want status, 2 returns flag, 3 returns status */ /* if num = 1, it returns the want status, 2 returns flag, 3 returns status */
unsigned int get_status(const unsigned int status_node, const int num) static unsigned int get_status(const unsigned int status_node, const int num)
{ {
char *status_string = name_hashtable[status_hashtable[status_node]->status]; char *status_string = name_hashtable[status_hashtable[status_node]->status];
char *state_sub_string; char *state_sub_string;
@ -646,7 +646,7 @@ unsigned int get_status(const unsigned int status_node, const int num)
return(state_sub_num); return(state_sub_num);
} }
void set_status(const unsigned int status_node_num, const char *new_value, const int position) static void set_status(const unsigned int status_node_num, const char *new_value, const int position)
{ {
const unsigned int new_value_len = strlen(new_value); const unsigned int new_value_len = strlen(new_value);
const unsigned int new_value_num = search_name_hashtable(new_value); const unsigned int new_value_num = search_name_hashtable(new_value);
@ -682,7 +682,7 @@ void set_status(const unsigned int status_node_num, const char *new_value, const
return; return;
} }
const char *describe_status(int status_num) { static const char *describe_status(int status_num) {
int status_want, status_state ; int status_want, status_state ;
if ( status_hashtable[status_num] == NULL || status_hashtable[status_num]->status == 0 ) if ( status_hashtable[status_num] == NULL || status_hashtable[status_num]->status == 0 )
return "is not installed or flagged to be installed\n"; return "is not installed or flagged to be installed\n";
@ -707,7 +707,7 @@ const char *describe_status(int status_num) {
} }
void index_status_file(const char *filename) static void index_status_file(const char *filename)
{ {
FILE *status_file; FILE *status_file;
char *control_buffer; char *control_buffer;
@ -812,7 +812,7 @@ char *get_depends_field(common_node_t *package, const int depends_type)
} }
#endif #endif
void write_buffer_no_status(FILE *new_status_file, const char *control_buffer) static void write_buffer_no_status(FILE *new_status_file, const char *control_buffer)
{ {
char *name; char *name;
char *value; char *value;
@ -830,7 +830,7 @@ void write_buffer_no_status(FILE *new_status_file, const char *control_buffer)
} }
/* This could do with a cleanup */ /* This could do with a cleanup */
void write_status_file(deb_file_t **deb_file) static void write_status_file(deb_file_t **deb_file)
{ {
FILE *old_status_file = bb_xfopen("/var/lib/dpkg/status", "r"); FILE *old_status_file = bb_xfopen("/var/lib/dpkg/status", "r");
FILE *new_status_file = bb_xfopen("/var/lib/dpkg/status.udeb", "w"); FILE *new_status_file = bb_xfopen("/var/lib/dpkg/status.udeb", "w");
@ -978,7 +978,7 @@ void write_status_file(deb_file_t **deb_file)
* which a regular depends can be satisfied by a package which we want * which a regular depends can be satisfied by a package which we want
* to install. * to install.
*/ */
int package_satisfies_dependency(int package, int depend_type) static int package_satisfies_dependency(int package, int depend_type)
{ {
int status_num = search_status_hashtable(name_hashtable[package_hashtable[package]->name]); int status_num = search_status_hashtable(name_hashtable[package_hashtable[package]->name]);
@ -995,7 +995,7 @@ int package_satisfies_dependency(int package, int depend_type)
return 0; return 0;
} }
int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count) static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
{ {
int *conflicts = NULL; int *conflicts = NULL;
int conflicts_num = 0; int conflicts_num = 0;
@ -1204,7 +1204,7 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
return(TRUE); return(TRUE);
} }
char **create_list(const char *filename) static char **create_list(const char *filename)
{ {
FILE *list_stream; FILE *list_stream;
char **file_list = NULL; char **file_list = NULL;
@ -1233,7 +1233,7 @@ char **create_list(const char *filename)
} }
/* maybe i should try and hook this into remove_file.c somehow */ /* maybe i should try and hook this into remove_file.c somehow */
int remove_file_array(char **remove_names, char **exclude_names) static int remove_file_array(char **remove_names, char **exclude_names)
{ {
struct stat path_stat; struct stat path_stat;
int match_flag; int match_flag;
@ -1271,7 +1271,7 @@ int remove_file_array(char **remove_names, char **exclude_names)
return(remove_flag); return(remove_flag);
} }
int run_package_script(const char *package_name, const char *script_type) static int run_package_script(const char *package_name, const char *script_type)
{ {
struct stat path_stat; struct stat path_stat;
char *script_path; char *script_path;
@ -1290,10 +1290,10 @@ int run_package_script(const char *package_name, const char *script_type)
return(result); return(result);
} }
const char *all_control_files[] = {"preinst", "postinst", "prerm", "postrm", static const char *all_control_files[] = {"preinst", "postinst", "prerm", "postrm",
"list", "md5sums", "shlibs", "conffiles", "config", "templates", NULL }; "list", "md5sums", "shlibs", "conffiles", "config", "templates", NULL };
char **all_control_list(const char *package_name) static char **all_control_list(const char *package_name)
{ {
unsigned short i = 0; unsigned short i = 0;
char **remove_files; char **remove_files;
@ -1310,7 +1310,7 @@ char **all_control_list(const char *package_name)
return(remove_files); return(remove_files);
} }
void free_array(char **array) static void free_array(char **array)
{ {
if (array) { if (array) {
@ -1364,7 +1364,7 @@ static void list_packages(void)
} }
} }
void remove_package(const unsigned int package_num, int noisy) static void remove_package(const unsigned int package_num, int noisy)
{ {
const char *package_name = name_hashtable[package_hashtable[package_num]->name]; const char *package_name = name_hashtable[package_hashtable[package_num]->name];
const char *package_version = name_hashtable[package_hashtable[package_num]->version]; const char *package_version = name_hashtable[package_hashtable[package_num]->version];
@ -1418,7 +1418,7 @@ void remove_package(const unsigned int package_num, int noisy)
set_status(status_num, "config-files", 3); set_status(status_num, "config-files", 3);
} }
void purge_package(const unsigned int package_num) static void purge_package(const unsigned int package_num)
{ {
const char *package_name = name_hashtable[package_hashtable[package_num]->name]; const char *package_name = name_hashtable[package_hashtable[package_num]->name];
const char *package_version = name_hashtable[package_hashtable[package_num]->version]; const char *package_version = name_hashtable[package_hashtable[package_num]->version];
@ -1614,7 +1614,7 @@ static void unpack_package(deb_file_t *deb_file)
free(info_prefix); free(info_prefix);
} }
void configure_package(deb_file_t *deb_file) static void configure_package(deb_file_t *deb_file)
{ {
const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name]; const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name];
const char *package_version = name_hashtable[package_hashtable[deb_file->package]->version]; const char *package_version = name_hashtable[package_hashtable[deb_file->package]->version];

1
archival/libunarchive/check_header_gzip.c
View File

@ -1,6 +1,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include "libbb.h" #include "libbb.h"
#include "unarchive.h" /* for external decl of check_header_gzip */
extern void check_header_gzip(int src_fd) extern void check_header_gzip(int src_fd)
{ {

14
archival/libunarchive/decompress_uncompress.c
View File

@ -65,23 +65,23 @@
#define MAXCODE(n) (1L << (n)) #define MAXCODE(n) (1L << (n))
/* Block compress mode -C compatible with 2.0 */ /* Block compress mode -C compatible with 2.0 */
int block_mode = BLOCK_MODE; static int block_mode = BLOCK_MODE;
/* user settable max # bits/code */ /* user settable max # bits/code */
int maxbits = BITS; static int maxbits = BITS;
/* Exitcode of compress (-1 no file compressed) */ /* Exitcode of compress (-1 no file compressed) */
int exit_code = -1; static int exit_code = -1;
/* Input buffer */ /* Input buffer */
unsigned char inbuf[IBUFSIZ + 64]; static unsigned char inbuf[IBUFSIZ + 64];
/* Output buffer */ /* Output buffer */
unsigned char outbuf[OBUFSIZ + 2048]; static unsigned char outbuf[OBUFSIZ + 2048];
long int htab[HSIZE]; static long int htab[HSIZE];
unsigned short codetab[HSIZE]; static unsigned short codetab[HSIZE];
#define htabof(i) htab[i] #define htabof(i) htab[i]
#define codetabof(i) codetab[i] #define codetabof(i) codetab[i]

2
archival/rpm2cpio.c
View File

@ -48,7 +48,7 @@ struct rpm_header {
uint32_t size; /* Size of store (4 bytes) */ uint32_t size; /* Size of store (4 bytes) */
}; };
void skip_header(int rpm_fd) static void skip_header(int rpm_fd)
{ {
struct rpm_header header; struct rpm_header header;

2
coreutils/md5_sha1_sum.c
View File

@ -80,7 +80,7 @@ static uint8_t *hash_file(const char *filename, uint8_t hash_algo)
} }
/* This could become a common function for md5 as well, by using md5_stream */ /* This could become a common function for md5 as well, by using md5_stream */
extern int hash_files(int argc, char **argv, const uint8_t hash_algo) static int hash_files(int argc, char **argv, const uint8_t hash_algo)
{ {
int return_value = EXIT_SUCCESS; int return_value = EXIT_SUCCESS;
uint8_t *hash_value; uint8_t *hash_value;

6
coreutils/sort.c
View File

@ -31,7 +31,7 @@
#include <unistd.h> #include <unistd.h>
#include "busybox.h" #include "busybox.h"
int global_flags; static int global_flags;
/* /*
sort [-m][-o output][-bdfinru][-t char][-k keydef]... [file...] sort [-m][-o output][-bdfinru][-t char][-k keydef]... [file...]
@ -57,9 +57,9 @@ int global_flags;
#ifdef CONFIG_SORT_BIG #ifdef CONFIG_SORT_BIG
char key_separator; static char key_separator;
struct sort_key static struct sort_key
{ {
struct sort_key *next_key; /* linked list */ struct sort_key *next_key; /* linked list */
unsigned short range[4]; /* start word, start char, end word, end char */ unsigned short range[4]; /* start word, start char, end word, end char */

24
editors/sed.c
View File

@ -116,18 +116,18 @@ typedef struct sed_cmd_s {
/* globals */ /* globals */
/* options */ /* options */
static int be_quiet, in_place, regex_type; static int be_quiet, in_place, regex_type;
FILE *nonstdout; static FILE *nonstdout;
char *outname,*hold_space; static char *outname,*hold_space;
/* List of input files */ /* List of input files */
int input_file_count,current_input_file; static int input_file_count,current_input_file;
FILE **input_file_list; static FILE **input_file_list;
static const char bad_format_in_subst[] = static const char bad_format_in_subst[] =
"bad format in substitution expression"; "bad format in substitution expression";
const char *const semicolon_whitespace = "; \n\r\t\v"; static const char *const semicolon_whitespace = "; \n\r\t\v";
regmatch_t regmatch[10]; static regmatch_t regmatch[10];
static regex_t *previous_regex_ptr; static regex_t *previous_regex_ptr;
/* linked list of sed commands */ /* linked list of sed commands */
@ -135,11 +135,11 @@ static sed_cmd_t sed_cmd_head;
static sed_cmd_t *sed_cmd_tail = &sed_cmd_head; static sed_cmd_t *sed_cmd_tail = &sed_cmd_head;
/* Linked list of append lines */ /* Linked list of append lines */
struct append_list { static struct append_list {
char *string; char *string;
struct append_list *next; struct append_list *next;
}; };
struct append_list *append_head=NULL, *append_tail=NULL; static struct append_list *append_head=NULL, *append_tail=NULL;
#ifdef CONFIG_FEATURE_CLEAN_UP #ifdef CONFIG_FEATURE_CLEAN_UP
static void free_and_close_stuff(void) static void free_and_close_stuff(void)
@ -482,7 +482,7 @@ static char *parse_cmd_args(sed_cmd_t *sed_cmd, char *cmdstr)
/* Parse address+command sets, skipping comment lines. */ /* Parse address+command sets, skipping comment lines. */
void add_cmd(char *cmdstr) static void add_cmd(char *cmdstr)
{ {
static char *add_cmd_line=NULL; static char *add_cmd_line=NULL;
sed_cmd_t *sed_cmd; sed_cmd_t *sed_cmd;
@ -576,7 +576,7 @@ void add_cmd(char *cmdstr)
/* Append to a string, reallocating memory as necessary. */ /* Append to a string, reallocating memory as necessary. */
struct pipeline { static struct pipeline {
char *buf; /* Space to hold string */ char *buf; /* Space to hold string */
int idx; /* Space used */ int idx; /* Space used */
int len; /* Space allocated */ int len; /* Space allocated */
@ -584,7 +584,7 @@ struct pipeline {
#define PIPE_GROW 64 #define PIPE_GROW 64
void pipe_putc(char c) static void pipe_putc(char c)
{ {
if(pipeline.idx==pipeline.len) { if(pipeline.idx==pipeline.len) {
pipeline.buf = xrealloc(pipeline.buf, pipeline.len + PIPE_GROW); pipeline.buf = xrealloc(pipeline.buf, pipeline.len + PIPE_GROW);
@ -729,7 +729,7 @@ static void flush_append(void)
append_head=append_tail=NULL; append_head=append_tail=NULL;
} }
void add_input_file(FILE *file) static void add_input_file(FILE *file)
{ {
input_file_list=xrealloc(input_file_list,(input_file_count+1)*sizeof(FILE *)); input_file_list=xrealloc(input_file_list,(input_file_count+1)*sizeof(FILE *));
input_file_list[input_file_count++]=file; input_file_list[input_file_count++]=file;

2
findutils/find.c
View File

@ -59,7 +59,7 @@ static int xdev_count = 0;
#endif #endif
#ifdef CONFIG_FEATURE_FIND_NEWER #ifdef CONFIG_FEATURE_FIND_NEWER
time_t newer_mtime; static time_t newer_mtime;
#endif #endif
#ifdef CONFIG_FEATURE_FIND_INUM #ifdef CONFIG_FEATURE_FIND_INUM

2
libbb/hash_fd.c
View File

@ -197,7 +197,7 @@ static uint32_t mask[4] = { 0x00000000, 0xff000000, 0xffff0000, 0xffffff00 };
static uint32_t bits[4] = { 0x80000000, 0x00800000, 0x00008000, 0x00000080 }; static uint32_t bits[4] = { 0x80000000, 0x00800000, 0x00008000, 0x00000080 };
# endif /* __BYTE_ORDER */ # endif /* __BYTE_ORDER */
void sha1_end(unsigned char hval[], struct sha1_ctx_t *ctx) static void sha1_end(unsigned char hval[], struct sha1_ctx_t *ctx)
{ {
uint32_t i, cnt = (uint32_t) (ctx->count[0] & SHA1_MASK); uint32_t i, cnt = (uint32_t) (ctx->count[0] & SHA1_MASK);

2
libbb/interface.c
View File

@ -986,7 +986,7 @@ static int if_readconf(void)
return err; return err;
} }
char *get_name(char *name, char *p) static char *get_name(char *name, char *p)
{ {
/* Extract <name>[:<alias>] from nul-terminated p where p matches /* Extract <name>[:<alias>] from nul-terminated p where p matches
<name>[:<alias>]: after leading whitespace. <name>[:<alias>]: after leading whitespace.

4
loginutils/getty.c
View File

@ -151,7 +151,7 @@ struct options {
/* Storage for things detected while the login name was read. */ /* Storage for things detected while the login name was read. */
struct chardata { static struct chardata {
int erase; /* erase character */ int erase; /* erase character */
int kill; /* kill character */ int kill; /* kill character */
int eol; /* end-of-line character */ int eol; /* end-of-line character */
@ -161,7 +161,7 @@ struct chardata {
/* Initial values for the above. */ /* Initial values for the above. */
struct chardata init_chardata = { static struct chardata init_chardata = {
DEF_ERASE, /* default erase character */ DEF_ERASE, /* default erase character */
DEF_KILL, /* default kill character */ DEF_KILL, /* default kill character */
13, /* default eol char */ 13, /* default eol char */

2
loginutils/login.c
View File

@ -28,7 +28,7 @@
static void checkutmp(int picky); static void checkutmp(int picky);
static void setutmp(const char *name, const char *line); static void setutmp(const char *name, const char *line);
/* Stuff global to this file */ /* Stuff global to this file */
struct utmp utent; static struct utmp utent;
#endif #endif
// login defines // login defines

4
loginutils/passwd.c
View File

@ -21,7 +21,7 @@ static int new_password(const struct passwd *pw, int amroot, int algo);
static void set_filesize_limit(int blocks); static void set_filesize_limit(int blocks);
int get_algo(char *a) static int get_algo(char *a)
{ {
int x = 1; /* standard: MD5 */ int x = 1; /* standard: MD5 */
@ -31,7 +31,7 @@ int get_algo(char *a)
} }
extern int update_passwd(const struct passwd *pw, char *crypt_pw) static int update_passwd(const struct passwd *pw, char *crypt_pw)
{ {
char filename[1024]; char filename[1024];
char buf[1025]; char buf[1025];

2
loginutils/vlock.c
View File

@ -51,7 +51,7 @@ static int o_lock_all = 0;
static struct spwd *spw; static struct spwd *spw;
/* getspuid - get a shadow entry by uid */ /* getspuid - get a shadow entry by uid */
struct spwd *getspuid(uid_t uid) static struct spwd *getspuid(uid_t uid)
{ {
struct spwd *sp; struct spwd *sp;
struct passwd *mypw; struct passwd *mypw;

4
miscutils/hdparm.c
View File

@ -467,8 +467,8 @@ static const char *secu_str[] = {
/* Busybox messages and functions */ /* Busybox messages and functions */
const char * const bb_msg_shared_mem ="could not %s sharedmem buf"; static const char * const bb_msg_shared_mem ="could not %s sharedmem buf";
const char * const bb_msg_op_not_supp =" operation not supported on %s disks"; static const char * const bb_msg_op_not_supp =" operation not supported on %s disks";
static void bb_ioctl(int fd, int request, void *argp, const char *string) static void bb_ioctl(int fd, int request, void *argp, const char *string)
{ {

2
modutils/modprobe.c
View File

@ -61,7 +61,7 @@ static struct dep_t *depend;
static int autoclean, show_only, quiet, do_syslog, verbose; static int autoclean, show_only, quiet, do_syslog, verbose;
static int k_version; static int k_version;
int parse_tag_value ( char *buffer, char **ptag, char **pvalue ) static int parse_tag_value ( char *buffer, char **ptag, char **pvalue )
{ {
char *tag, *value; char *tag, *value;

6
networking/arping.c
View File

@ -106,7 +106,7 @@ static int send_pack(int sock, struct in_addr *src_addr,
return err; return err;
} }
void finish(void) static void finish(void)
{ {
if (!quiet) { if (!quiet) {
printf("Sent %d probes (%d broadcast(s))\n", sent, brd_sent); printf("Sent %d probes (%d broadcast(s))\n", sent, brd_sent);
@ -129,7 +129,7 @@ void finish(void)
exit(!received); exit(!received);
} }
void catcher(void) static void catcher(void)
{ {
struct timeval tv; struct timeval tv;
static struct timeval start; static struct timeval start;
@ -151,7 +151,7 @@ void catcher(void)
alarm(1); alarm(1);
} }
int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM) static int recv_pack(unsigned char *buf, int len, struct sockaddr_ll *FROM)
{ {
struct timeval tv; struct timeval tv;
struct arphdr *ah = (struct arphdr *) buf; struct arphdr *ah = (struct arphdr *) buf;

4
networking/ifupdown.c
View File

@ -462,7 +462,7 @@ static struct method_t methods6[] = {
{ "loopback", loopback_up6, loopback_down6, }, { "loopback", loopback_up6, loopback_down6, },
}; };
struct address_family_t addr_inet6 = { static struct address_family_t addr_inet6 = {
"inet6", "inet6",
sizeof(methods6) / sizeof(struct method_t), sizeof(methods6) / sizeof(struct method_t),
methods6 methods6
@ -611,7 +611,7 @@ static struct method_t methods[] =
{ "loopback", loopback_up, loopback_down, }, { "loopback", loopback_up, loopback_down, },
}; };
struct address_family_t addr_inet = static struct address_family_t addr_inet =
{ {
"inet", "inet",
sizeof(methods) / sizeof(struct method_t), sizeof(methods) / sizeof(struct method_t),

2
networking/libiproute/ipaddress.c
View File

@ -48,7 +48,7 @@ static struct
struct rtnl_handle *rth; struct rtnl_handle *rth;
} filter; } filter;
void print_link_flags(FILE *fp, unsigned flags, unsigned mdown) static void print_link_flags(FILE *fp, unsigned flags, unsigned mdown)
{ {
fprintf(fp, "<"); fprintf(fp, "<");
flags &= ~IFF_RUNNING; flags &= ~IFF_RUNNING;

4
networking/libiproute/iptunnel.c
View File

@ -361,7 +361,7 @@ static int do_add(int cmd, int argc, char **argv)
return -1; return -1;
} }
int do_del(int argc, char **argv) static int do_del(int argc, char **argv)
{ {
struct ip_tunnel_parm p; struct ip_tunnel_parm p;
@ -381,7 +381,7 @@ int do_del(int argc, char **argv)
return -1; return -1;
} }
void print_tunnel(struct ip_tunnel_parm *p) static void print_tunnel(struct ip_tunnel_parm *p)
{ {
char s1[256]; char s1[256];
char s2[256]; char s2[256];

2
networking/libiproute/ll_proto.c
View File

@ -90,7 +90,7 @@ __PF(ECONET,econet)
#undef __PF #undef __PF
char * ll_proto_n2a(unsigned short id, char *buf, int len) const char * ll_proto_n2a(unsigned short id, char *buf, int len)
{ {
int i; int i;

2
networking/libiproute/ll_types.c
View File

@ -13,7 +13,7 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
char * ll_type_n2a(int type, char *buf, int len) const char * ll_type_n2a(int type, char *buf, int len)
{ {
#define __PF(f,n) { ARPHRD_##f, #n }, #define __PF(f,n) { ARPHRD_##f, #n },
static struct { static struct {

10
networking/libiproute/rt_names.c
View File

@ -76,7 +76,7 @@ static void rtnl_rtprot_initialize(void)
rtnl_rtprot_tab, 256); rtnl_rtprot_tab, 256);
} }
char * rtnl_rtprot_n2a(int id, char *buf, int len) const char * rtnl_rtprot_n2a(int id, char *buf, int len)
{ {
if (id<0 || id>=256) { if (id<0 || id>=256) {
snprintf(buf, len, "%d", id); snprintf(buf, len, "%d", id);
@ -143,7 +143,7 @@ static void rtnl_rtscope_initialize(void)
rtnl_rtscope_tab, 256); rtnl_rtscope_tab, 256);
} }
char * rtnl_rtscope_n2a(int id, char *buf, int len) const char * rtnl_rtscope_n2a(int id, char *buf, int len)
{ {
if (id<0 || id>=256) { if (id<0 || id>=256) {
snprintf(buf, len, "%d", id); snprintf(buf, len, "%d", id);
@ -206,7 +206,7 @@ static void rtnl_rtrealm_initialize(void)
rtnl_rtrealm_tab, 256); rtnl_rtrealm_tab, 256);
} }
char * rtnl_rtrealm_n2a(int id, char *buf, int len) const char * rtnl_rtrealm_n2a(int id, char *buf, int len)
{ {
if (id<0 || id>=256) { if (id<0 || id>=256) {
snprintf(buf, len, "%d", id); snprintf(buf, len, "%d", id);
@ -272,7 +272,7 @@ static void rtnl_rttable_initialize(void)
rtnl_rttable_tab, 256); rtnl_rttable_tab, 256);
} }
char * rtnl_rttable_n2a(int id, char *buf, int len) const char * rtnl_rttable_n2a(int id, char *buf, int len)
{ {
if (id<0 || id>=256) { if (id<0 || id>=256) {
snprintf(buf, len, "%d", id); snprintf(buf, len, "%d", id);
@ -334,7 +334,7 @@ static void rtnl_rtdsfield_initialize(void)
rtnl_rtdsfield_tab, 256); rtnl_rtdsfield_tab, 256);
} }
char * rtnl_dsfield_n2a(int id, char *buf, int len) const char * rtnl_dsfield_n2a(int id, char *buf, int len)
{ {
if (id<0 || id>=256) { if (id<0 || id>=256) {
snprintf(buf, len, "%d", id); snprintf(buf, len, "%d", id);

2
networking/nameif.c
View File

@ -86,7 +86,7 @@ static void serror(const char *s, ...)
} }
/* Check ascii str_macaddr, convert and copy to *mac */ /* Check ascii str_macaddr, convert and copy to *mac */
struct ether_addr *cc_macaddr(char *str_macaddr) static struct ether_addr *cc_macaddr(char *str_macaddr)
{ {
struct ether_addr *lmac, *mac; struct ether_addr *lmac, *mac;

5
networking/ping.c
View File

@ -178,7 +178,10 @@ static int myid, options;
static unsigned long tmin = ULONG_MAX, tmax, tsum; static unsigned long tmin = ULONG_MAX, tmax, tsum;
static char rcvd_tbl[MAX_DUP_CHK / 8]; static char rcvd_tbl[MAX_DUP_CHK / 8];
struct hostent *hostent; #ifndef CONFIG_FEATURE_FANCY_PING6
static
#endif
struct hostent *hostent;
static void sendping(int); static void sendping(int);
static void pingstats(int); static void pingstats(int);

1
networking/route.c
View File

@ -485,6 +485,7 @@ void set_flags(char *flagstr, int flags)
} }
} }
/* also used in netstat */
void displayroutes(int noresolve, int netstatfmt) void displayroutes(int noresolve, int netstatfmt)
{ {
char devname[64], flags[16], sdest[16], sgw[16]; char devname[64], flags[16], sdest[16], sgw[16];

4
networking/tftp.c
View File

@ -71,8 +71,8 @@ static const char *tftp_bb_error_msg[] = {
"No such user" "No such user"
}; };
const int tftp_cmd_get = 1; static const int tftp_cmd_get = 1;
const int tftp_cmd_put = 2; static const int tftp_cmd_put = 2;
#ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE

2
networking/udhcp/script.h
View File

@ -1,6 +1,6 @@
#ifndef _SCRIPT_H #ifndef _SCRIPT_H
#define _SCRIPT_H #define _SCRIPT_H
void run_script(struct dhcpMessage *packet, const char *name); extern void run_script(struct dhcpMessage *packet, const char *name);
#endif #endif

4
networking/wget.c
View File

@ -117,9 +117,9 @@ static char *safe_fgets(char *s, int size, FILE *stream)
/* /*
* Base64-encode character string * Base64-encode character string
* oops... isn't something similar in uuencode.c? * oops... isn't something similar in uuencode.c?
* It would be better to use already existing code * XXX: It would be better to use already existing code
*/ */
char *base64enc(unsigned char *p, char *buf, int len) { static char *base64enc(unsigned char *p, char *buf, int len) {
char al[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" char al[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
"0123456789+/"; "0123456789+/";

2
procps/top.c
View File

@ -78,7 +78,7 @@ static int time_sort (procps_status_t *P, procps_status_t *Q)
return (int)((Q->stime + Q->utime) - (P->stime + P->utime)); return (int)((Q->stime + Q->utime) - (P->stime + P->utime));
} }
int mult_lvl_cmp(void* a, void* b) { static int mult_lvl_cmp(void* a, void* b) {
int i, cmp_val; int i, cmp_val;
for(i = 0; i < sort_depth; i++) { for(i = 0; i < sort_depth; i++) {