Changed names of functions in utility.c and all affected files, to make

compliant with the style guide. Everybody rebuild your tags file!

3 files changed, 17 insertions, 17 deletions

diff --git a/procps/kill.c b/procps/kill.c
index dd5ca49fa..caaa52a5b 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -204,10 +204,10 @@ extern int kill_main(int argc, char **argv)
                         int pid;
 
                         if (!isdigit(**argv))
-                                fatalError( "Bad PID: %s\n", strerror(errno));
+                                error_msg_and_die( "Bad PID: %s\n", strerror(errno));
                         pid = strtol(*argv, NULL, 0);
                         if (kill(pid, sig) != 0) 
-                                fatalError( "Could not kill pid '%d': %s\n", pid, strerror(errno));
+                                error_msg_and_die( "Could not kill pid '%d': %s\n", pid, strerror(errno));
                         argv++;
                 }
         } 
@@ -219,20 +219,20 @@ extern int kill_main(int argc, char **argv)
                 while (--argc >= 0) {
                         pid_t* pidList;
 
-                        pidList = findPidByName( *argv);
+                        pidList = find_pid_by_name( *argv);
                         if (!pidList) {
                                 all_found = FALSE;
-                                errorMsg( "%s: no process killed\n", *argv);
+                                error_msg( "%s: no process killed\n", *argv);
                         }
 
                         for(; pidList && *pidList!=0; pidList++) {
                                 if (*pidList==myPid)
                                         continue;
                                 if (kill(*pidList, sig) != 0) 
-                                        fatalError( "Could not kill pid '%d': %s\n", *pidList, strerror(errno));
+                                        error_msg_and_die( "Could not kill pid '%d': %s\n", *pidList, strerror(errno));
                         }
                         /* Note that we don't bother to free the memory
-                         * allocated in findPidByName().  It will be freed
+                         * allocated in find_pid_by_name().  It will be freed
                          * upon exit, so we can save a byte or two */
                         argv++;
                 }
@@ -245,5 +245,5 @@ extern int kill_main(int argc, char **argv)
 
 
   end:
-        fatalError( "bad signal name: %s\n", *argv);
+        error_msg_and_die( "bad signal name: %s\n", *argv);
 }
diff --git a/procps/ps.c b/procps/ps.c
index 4998e15b1..79910fe34 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -97,20 +97,20 @@ static void parse_proc_status(char *S, proc_t * P)
         if (tmp)
                 sscanf(tmp, "Pid:\t%d\n" "PPid:\t%d\n", &P->pid, &P->ppid);
         else
-                errorMsg("Internal error!\n");
+                error_msg("Internal error!\n");
 
         /* For busybox, ignoring effective, saved, etc */
         tmp = strstr(S, "Uid:");
         if (tmp)
                 sscanf(tmp, "Uid:\t%d", &P->ruid);
         else
-                errorMsg("Internal error!\n");
+                error_msg("Internal error!\n");
 
         tmp = strstr(S, "Gid:");
         if (tmp)
                 sscanf(tmp, "Gid:\t%d", &P->rgid);
         else
-                errorMsg("Internal error!\n");
+                error_msg("Internal error!\n");
 
 }
 
@@ -135,7 +135,7 @@ extern int ps_main(int argc, char **argv)
 
         dir = opendir("/proc");
         if (!dir)
-                fatalError("Can't open /proc\n");
+                error_msg_and_die("Can't open /proc\n");
 
 #ifdef BB_FEATURE_AUTOWIDTH
                 ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@ -219,11 +219,11 @@ extern int ps_main(int argc, char **argv)
         /* open device */ 
         fd = open(device, O_RDONLY);
         if (fd < 0) 
-                fatalError( "open failed for `%s': %s\n", device, strerror (errno));
+                error_msg_and_die( "open failed for `%s': %s\n", device, strerror (errno));
 
         /* Find out how many processes there are */
         if (ioctl (fd, DEVPS_GET_NUM_PIDS, &num_pids)<0) 
-                fatalError( "\nDEVPS_GET_PID_LIST: %s\n", strerror (errno));
+                error_msg_and_die( "\nDEVPS_GET_PID_LIST: %s\n", strerror (errno));
         
         /* Allocate some memory -- grab a few extras just in case 
          * some new processes start up while we wait. The kernel will
@@ -234,7 +234,7 @@ extern int ps_main(int argc, char **argv)
 
         /* Now grab the pid list */
         if (ioctl (fd, DEVPS_GET_PID_LIST, pid_array)<0) 
-                fatalError("\nDEVPS_GET_PID_LIST: %s\n", strerror (errno));
+                error_msg_and_die("\nDEVPS_GET_PID_LIST: %s\n", strerror (errno));
 
 #ifdef BB_FEATURE_AUTOWIDTH
                 ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@ -252,7 +252,7 @@ extern int ps_main(int argc, char **argv)
             info.pid = pid_array[i];
 
             if (ioctl (fd, DEVPS_GET_PID_INFO, &info)<0)
-                        fatalError("\nDEVPS_GET_PID_INFO: %s\n", strerror (errno));
+                        error_msg_and_die("\nDEVPS_GET_PID_INFO: %s\n", strerror (errno));
             
                 /* Make some adjustments as needed */
                 my_getpwuid(uidName, info.euid);
@@ -282,7 +282,7 @@ extern int ps_main(int argc, char **argv)
 
         /* close device */
         if (close (fd) != 0) 
-                fatalError("close failed for `%s': %s\n", device, strerror (errno));
+                error_msg_and_die("close failed for `%s': %s\n", device, strerror (errno));
  
         exit (0);
 }
diff --git a/procps/renice.c b/procps/renice.c
index c81f31c5c..8f0618126 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -44,7 +44,7 @@ extern int renice_main(int argc, char **argv)
                 if (setpriority(PRIO_PROCESS, ps, prio) == 0) {
                         printf("%d: old priority %d, new priority %d\n", ps, oldp, prio );
                 } else {
-                        perrorMsg("%d: setpriority", ps);
+                        perror_msg("%d: setpriority", ps);
                         status = EXIT_FAILURE;
                 }
         }