library: eliminated the questionable 'procps.h' header

There was a time when that procps.h file served a more
traditional role. Prior to the commit referenced below
it held just macros plus manifest constants. But, with
that change, such items were replaced with a series of
includes embracing all the library exported functions.

That approach was known to disguise errors which would
have otherwise yielded a compiler warning. And without
such a warning, there was no way to address the error.

So this patch will trade the all inclusive header file
approach for individual includes only where necessary.

Reference(s):
. April 2016, procps.h header file revamped
commit ccb6ae8de1
. Sept 2018, top abandoned use of procps.h
commit a6dfc2382e

Signed-off-by: Jim Warner <james.warner@comcast.net>

proc/escape.c

@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <string.h>
-#include <proc/procps.h>
 
 #include "escape.h"
 #include "readproc.h"

proc/escape.h

@@ -8,7 +8,9 @@
 #define ESC_BRACKETS 0x2  // if using cmd, put '[' and ']' around it
 #define ESC_DEFUNCT  0x4  // mark zombies with " <defunct>"
 
-
 int escape_command(char *__restrict const outbuf, const proc_t *__restrict const pp, int bytes, int *cells, unsigned flags);
 
+#define ESC_STRETCH 1  // since we mangle to '?' this is 1 (would be 4 for octal escapes)
+int escape_str(char *__restrict dst, const char *__restrict src, int bufsize, int *maxcells);
+
 #endif

proc/procps.h

@@ -1,37 +0,0 @@
-/*
- * libprocps - Library to read proc filesystem
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#ifndef PROCPS_PROC_PROCPS_H
-#define PROCPS_PROC_PROCPS_H
-
-/* includes that show public exports go here */
-#include <proc/diskstats.h>
-#include <proc/meminfo.h>
-#include <proc/namespace.h>
-#include <proc/pids.h>
-#include <proc/slabinfo.h>
-#include <proc/stat.h>
-#include <proc/sysinfo.h>
-#include <proc/version.h>
-#include <proc/vmstat.h>
-#include <proc/uptime.h>
-
-// FIXME: only public function in escape.c
-#define ESC_STRETCH 1  // since we mangle to '?' this is 1 (would be 4 for octal escapes)
-int escape_str(char *__restrict dst, const char *__restrict src, int bufsize, int *maxcells);
-
-#endif

proc/readproc.c

@@ -19,12 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "version.h"
-#include "readproc.h"
-#include "escape.h"
-#include "pwcache.h"
-#include "devname.h"
-#include "procps.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -41,7 +35,13 @@
 #ifdef WITH_SYSTEMD
 #include <systemd/sd-login.h>
 #endif
-#include <proc/namespace.h>
+
+#include "devname.h"
+#include "escape.h"
+#include "namespace.h"
+#include "pwcache.h"
+#include "readproc.h"
+#include "version.h"
 
 // sometimes it's easier to do this manually, w/o gcc helping
 #ifdef PROF

proc/test_namespace.c

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <proc/procps.h>
+#include <proc/namespace.h>
 #include "tests.h"
 
 int check_name_minus(void *data)

proc/test_uptime.c

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <proc/procps.h>
+#include <proc/uptime.h>
 #include "tests.h"
 
 int check_uptime(void *data)