From 1e073d05eba0f93e43a8d06332564a4a6c17d9f6 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@openvz.org>
Date: Sat, 14 Jan 2012 01:48:29 +0400
Subject: [PATCH] crtools: A few style update on proc_parse

No func changes.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
 include/proc_parse.h | 105 ++++++++++++++++++++++---------------------
 proc_parse.c         |  10 ++++-
 2 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/include/proc_parse.h b/include/proc_parse.h
index 87c165647..3e73f2e85 100644
--- a/include/proc_parse.h
+++ b/include/proc_parse.h
@@ -1,58 +1,59 @@
-#ifndef __PROC_PARSE_H__
-#define __PROC_PARSE_H__
-int parse_maps(pid_t pid, int pid_dir, struct list_head *vma_area_list, bool use_map_files);
+#ifndef PROC_PARSE_H__
+#define PROC_PARSE_H__
 
 #define TASK_COMM_LEN 16
 
 struct proc_pid_stat {
-	int pid;
-	char comm[TASK_COMM_LEN];
-	char state;
-	int ppid;
-	int pgid;
-	int sid;
-	int tty_nr;
-	int tty_pgrp;
-	unsigned int flags;
-	unsigned long min_flt;
-	unsigned long cmin_flt;
-	unsigned long maj_flt;
-	unsigned long cmaj_flt;
-	unsigned long utime;
-	unsigned long stime;
-	long cutime;
-	long cstime;
-	long priority;
-	long nice;
-	int num_threads;
-	int zero0;
-	unsigned long long start_time;
-	unsigned long vsize;
-	long mm_rss;
-	unsigned long rsslim;
-	unsigned long start_code;
-	unsigned long end_code;
-	unsigned long start_stack;
-	unsigned long esp;
-	unsigned long eip;
-	unsigned long sig_pending;
-	unsigned long sig_blocked;
-	unsigned long sig_ignored;
-	unsigned long sig_handled;
-	unsigned long wchan;
-	unsigned long zero1;
-	unsigned long zero2;
-	int exit_signal;
-	int task_cpu;
-	unsigned int rt_priority;
-	unsigned int policy;
-	unsigned long long delayacct_blkio_ticks;
-	unsigned long gtime;
-	long cgtime;
-	unsigned long start_data;
-	unsigned long end_data;
-	unsigned long start_brk;
+	int			pid;
+	char			comm[TASK_COMM_LEN];
+	char			state;
+	int			ppid;
+	int			pgid;
+	int			sid;
+	int			tty_nr;
+	int			tty_pgrp;
+	unsigned int		flags;
+	unsigned long		min_flt;
+	unsigned long		cmin_flt;
+	unsigned long		maj_flt;
+	unsigned long		cmaj_flt;
+	unsigned long		utime;
+	unsigned long		stime;
+	long			cutime;
+	long			cstime;
+	long			priority;
+	long			nice;
+	int			num_threads;
+	int			zero0;
+	unsigned long long	start_time;
+	unsigned long		vsize;
+	long			mm_rss;
+	unsigned long		rsslim;
+	unsigned long		start_code;
+	unsigned long		end_code;
+	unsigned long		start_stack;
+	unsigned long		esp;
+	unsigned long		eip;
+	unsigned long		sig_pending;
+	unsigned long		sig_blocked;
+	unsigned long		sig_ignored;
+	unsigned long		sig_handled;
+	unsigned long		wchan;
+	unsigned long		zero1;
+	unsigned long		zero2;
+	int			exit_signal;
+	int			task_cpu;
+	unsigned int		rt_priority;
+	unsigned int		policy;
+	unsigned long long	delayacct_blkio_ticks;
+	unsigned long		gtime;
+	long			cgtime;
+	unsigned long		start_data;
+	unsigned long		end_data;
+	unsigned long		start_brk;
 };
 
-int parse_pid_stat(pid_t pid, int pid_dir, struct proc_pid_stat *s);
-#endif
+extern int parse_pid_stat(pid_t pid, int pid_dir, struct proc_pid_stat *s);
+extern int parse_maps(pid_t pid, int pid_dir, struct list_head *vma_area_list, bool use_map_files);
+
+#endif /* PROC_PARSE_H__ */
diff --git a/proc_parse.c b/proc_parse.c
index 19b448829..54f00786a 100644
--- a/proc_parse.c
+++ b/proc_parse.c
@@ -6,10 +6,12 @@
 #include <dirent.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include "crtools.h"
+
 #include "types.h"
 #include "list.h"
 #include "util.h"
+#include "crtools.h"
+
 #include "proc_parse.h"
 
 int parse_maps(pid_t pid, int pid_dir, struct list_head *vma_area_list, bool use_map_files)
@@ -183,7 +185,10 @@ int parse_pid_stat(pid_t pid, int pid_dir, struct proc_pid_stat *s)
 	}
 
 	memset(s, 0, sizeof(*s));
-	fscanf(f, "%d (%s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu %ld %ld %ld %ld %d %d %llu %lu %ld %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld %lu %lu %lu",
+	fscanf(f,
+	       "%d (%s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu %ld %ld %ld "
+	       "%ld %d %d %llu %lu %ld %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu "
+	       "%lu %lu %lu %d %d %u %u %llu %lu %ld %lu %lu %lu",
 		&s->pid,
 		s->comm,
 		&s->state,
@@ -234,5 +239,6 @@ int parse_pid_stat(pid_t pid, int pid_dir, struct proc_pid_stat *s)
 
 	s->comm[strlen(s->comm) - 1] = '\0'; /* trim the ending ) */
 	fclose(f);
+
 	return 0;
 }