[gentoo-commits] gentoo-projects commit in pax-utils: pspax.c

[Mike Frysinger (vapier)]

vapier      09/03/15 09:23:30

  Modified:             pspax.c
  Log:
  fixup warning about caps code -- caps_free() does not take a const

Revision  Changes    Path
1.45                 pax-utils/pspax.c

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/pspax.c?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/pspax.c?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/pspax.c?r1=1.44&r2=1.45

Index: pspax.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/pspax.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pspax.c	15 Mar 2009 08:51:42 -0000	1.44
+++ pspax.c	15 Mar 2009 09:23:30 -0000	1.45
@@ -12,7 +12,7 @@
  *  cc -o pspax pspax.c -DWANT_SYSCAP -lcap
  */
 
-static const char *rcsid = "$Id: pspax.c,v 1.44 2009/03/15 08:51:42 vapier Exp $";
+static const char *rcsid = "$Id: pspax.c,v 1.45 2009/03/15 09:23:30 vapier Exp $";
 const char * const argv0 = "pspax";
 
 #include "paxinc.h"
@@ -298,13 +298,12 @@
 	int have_attr, have_addr, wx;
 	struct passwd *pwd;
 	struct stat st;
-	const char *pax, *type, *name, *caps, *attr, *addr;
-	WRAP_SYSCAP(ssize_t length; cap_t cap_d;);
+	const char *pax, *type, *name, *attr, *addr;
+	char *caps;
+	WRAP_SYSCAP(ssize_t length; cap_t cap_d;)
 
 	WRAP_SYSCAP(cap_d = cap_init());
 
-	caps = NULL;
-
 	dir = opendir(PROC_DIR);
 	if (dir == NULL || chdir(PROC_DIR))
 		errp(PROC_DIR);
@@ -365,6 +364,7 @@
 					continue;
 
 			/* this is a non-POSIX function */
+			caps = NULL;
 			WRAP_SYSCAP(capgetp(pid, cap_d));
 			WRAP_SYSCAP(caps = cap_to_text(cap_d, &length));