a few more aesthetics-related fixes
Robert P. J. Day
rpjday at mindspring.com
Tue Mar 14 19:26:13 UTC 2006
most of these "extern"-related fixes were missed the first time as
the opening brace of the function was at the end of the first line
which screwed up the perl pattern match. this should take care of it.
diff -pru busybox.orig/libbb/xfuncs.c busybox/libbb/xfuncs.c
--- busybox.orig/libbb/xfuncs.c 2006-03-14 14:18:29.000000000 -0500
+++ busybox/libbb/xfuncs.c 2006-03-14 14:21:39.000000000 -0500
@@ -57,7 +57,8 @@ void *xcalloc(size_t nmemb, size_t size)
#endif /* DMALLOC */
#ifdef L_xstrdup
-extern char * bb_xstrdup (const char *s) {
+char * bb_xstrdup (const char *s)
+{
char *t;
if (s == NULL)
@@ -73,7 +74,8 @@ extern char * bb_xstrdup (const char *s)
#endif
#ifdef L_xstrndup
-extern char * bb_xstrndup (const char *s, int n) {
+char * bb_xstrndup (const char *s, int n)
+{
char *t;
if (s == NULL)
diff -pru busybox.orig/procps/fuser.c busybox/procps/fuser.c
--- busybox.orig/procps/fuser.c 2006-03-14 14:18:36.000000000 -0500
+++ busybox/procps/fuser.c 2006-03-14 14:23:04.000000000 -0500
@@ -73,7 +73,8 @@ static int fuser_file_to_dev_inode(const
return 1;
}
-static int fuser_find_socket_dev(dev_t *dev) {
+static int fuser_find_socket_dev(dev_t *dev)
+{
int fd = socket(PF_INET, SOCK_DGRAM,0);
struct stat buf;
@@ -278,7 +279,8 @@ static int fuser_scan_proc_pids(int opts
return 1;
}
-static int fuser_print_pid_list(pid_list *plist) {
+static int fuser_print_pid_list(pid_list *plist)
+{
pid_list *curr = plist;
if(plist == NULL) return 0;
@@ -290,7 +292,8 @@ static int fuser_print_pid_list(pid_list
return 1;
}
-static int fuser_kill_pid_list(pid_list *plist, int sig) {
+static int fuser_kill_pid_list(pid_list *plist, int sig)
+{
pid_list *curr = plist;
pid_t mypid = getpid();
int success = 1;
@@ -309,7 +312,8 @@ static int fuser_kill_pid_list(pid_list
return success;
}
-extern int fuser_main(int argc, char **argv) {
+int fuser_main(int argc, char **argv)
+{
int port, i, optn;
int* fni; /* file name indexes of argv */
int fnic = 0; /* file name index count */
More information about the busybox
mailing list