Removing old svn keywords.

[monky] / src / top.c

diff --git a/src/top.c b/src/top.c
index 8d757a1..9528818 100644 (file)
--- a/src/top.c
+++ b/src/top.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 2005 Adi Zaimi, Dan Piponi <dan@tanelorn.demon.co.uk>,
  *                                       Dave Clark <clarkd@skynet.ca>
- * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -24,7 +24,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$ */
+ */
 
 #include "top.h"
 
@@ -106,9 +106,7 @@ static struct process *new_process(int p)
  * Anyone hoping to port wmtop should look here first. */
 static int process_parse_stat(struct process *process)
 {
-       struct information *cur;
-
-       cur = &info;
+       struct information *cur = &info;
        char line[BUFFER_LEN] = { 0 }, filename[BUFFER_LEN], procname[BUFFER_LEN];
        int ps;
        unsigned long user_time = 0;
@@ -185,7 +183,7 @@ static int process_parse_stat(struct process *process)
        if (process->name) {
                free(process->name);
        }
-       process->name = strdup(deparenthesised_name);
+       process->name = strndup(deparenthesised_name, text_buffer_size);
        process->rss *= getpagesize();
 
        if (!cur->memmax) {
@@ -354,14 +352,14 @@ static unsigned long long calc_cpu_total(void)
        int ps;
        char line[BUFFER_LEN] = { 0 };
        unsigned long long cpu = 0;
-       unsigned long long nice = 0;
-       unsigned long long system = 0;
+       unsigned long long niceval = 0;
+       unsigned long long systemval = 0;
        unsigned long long idle = 0;
        unsigned long long iowait = 0;
        unsigned long long irq = 0;
        unsigned long long softirq = 0;
        unsigned long long steal = 0;
-       char *template =
+       const char *template =
                KFLAG_ISSET(KFLAG_IS_LONGSTAT) ? TMPL_LONGPROC : TMPL_SHORTPROC;
 
        ps = open("/proc/stat", O_RDONLY);
@@ -371,9 +369,9 @@ static unsigned long long calc_cpu_total(void)
                return 0;
        }
 
-       sscanf(line, template, &cpu, &nice, &system, &idle, &iowait, &irq,
+       sscanf(line, template, &cpu, &niceval, &systemval, &idle, &iowait, &irq,
                &softirq, &steal);
-       total = cpu + nice + system + idle + iowait + irq + softirq + steal;
+       total = cpu + niceval + systemval + idle + iowait + irq + softirq + steal;
 
        t = total - previous_total;
        previous_total = total;
@@ -519,7 +517,7 @@ void sp_acopy(struct sorted_process *sp_head, struct process **ar, int max_size)
  * Results are stored in the cpu,mem arrays in decreasing order[0-9]. *
  * ****************************************************************** */
 
-inline void process_find_top(struct process **cpu, struct process **mem)
+void process_find_top(struct process **cpu, struct process **mem)
 {
        struct sorted_process *spc_head = NULL, *spc_tail = NULL, *spc_cur = NULL;
        struct sorted_process *spm_head = NULL, *spm_tail = NULL, *spm_cur = NULL;