Unneeded code removed, usused field "unsigned pscpu" removed

[oweals/busybox.git] / include / libbb.h

diff --git a/include/libbb.h b/include/libbb.h
index 169964ba3a7ae297bbbcd167a99924bc9be968bd..3ef1af1ab2e9214f1061011aaa8330b2709db799 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -89,13 +89,13 @@
 #  define STRTOOFF strtol
 #  define SAFE_STRTOOFF safe_strtol
 #  define XSTRTOUOFF xstrtoul
-#  define OFF_FMT "%ld"
+#  define OFF_FMT "ld"
 # else
 /* "long" is too short, need "long long" */
 #  define STRTOOFF strtoll
 #  define SAFE_STRTOOFF safe_strtoll
 #  define XSTRTOUOFF xstrtoull
-#  define OFF_FMT "%lld"
+#  define OFF_FMT "lld"
 # endif
 #else
 # if 0 /* #if UINT_MAX == 0xffffffff */
@@ -104,12 +104,12 @@
 #  define STRTOOFF strtol
 #  define SAFE_STRTOOFF safe_strtoi
 #  define XSTRTOUOFF xstrtou
-#  define OFF_FMT "%d"
+#  define OFF_FMT "d"
 # else
 #  define STRTOOFF strtol
 #  define SAFE_STRTOOFF safe_strtol
 #  define XSTRTOUOFF xstrtoul
-#  define OFF_FMT "%ld"
+#  define OFF_FMT "ld"
 # endif
 #endif
 /* scary. better ideas? (but do *test* them first!) */
@@ -194,10 +194,10 @@ extern int is_directory(const char *name, int followLinks, struct stat *statBuf)
 extern int remove_file(const char *path, int flags);
 extern int copy_file(const char *source, const char *dest, int flags);
 extern int recursive_action(const char *fileName, int recurse,
-         int followLinks, int depthFirst,
-         int (*fileAction) (const char *fileName, struct stat* statbuf, void* userData),
-         int (*dirAction) (const char *fileName, struct stat* statbuf, void* userData),
-         void* userData);
+       int followLinks, int depthFirst,
+       int (*fileAction) (const char *fileName, struct stat* statbuf, void* userData, int depth),
+       int (*dirAction) (const char *fileName, struct stat* statbuf, void* userData, int depth),
+       void* userData, int depth);
 extern int device_open(const char *device, int mode);
 extern int get_console_fd(void);
 extern char *find_block_device(char *path);
@@ -501,14 +501,12 @@ void reset_ino_dev_hashtable(void);
 #endif
 #endif
 typedef struct {
-       int pid;
+       int pid, ppid;
        char user[9];
        char state[4];
        unsigned long rss;
-       int ppid;
 #ifdef CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
        unsigned pcpu;
-       unsigned pscpu;
        unsigned long stime, utime;
 #endif
        char *cmd;
@@ -518,15 +516,15 @@ typedef struct {
        char short_cmd[COMM_LEN];
 } procps_status_t;
 procps_status_t* procps_scan(int save_user_arg0);
-long *find_pid_by_name( const char* pidName);
-long *pidlist_reverse(long *pidList);
+pid_t *find_pid_by_name(const char* procName);
+pid_t *pidlist_reverse(pid_t *pidList);
 
 
 extern const char bb_uuenc_tbl_base64[];
 extern const char bb_uuenc_tbl_std[];
 void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl);
 
-typedef struct _sha1_ctx_t_ {
+typedef struct sha1_ctx_t {
        uint32_t count[2];
        uint32_t hash[5];
        uint32_t wbuf[16];
@@ -535,7 +533,7 @@ void sha1_begin(sha1_ctx_t *ctx);
 void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx);
 void *sha1_end(void *resbuf, sha1_ctx_t *ctx);
 
-typedef struct _md5_ctx_t_ {
+typedef struct md5_ctx_t {
        uint32_t A;
        uint32_t B;
        uint32_t C;