File libcap-gcc-warning-fixes.diff of Package libcap

Overview Repositories Revisions Requests Users Attributes Meta

File libcap-gcc-warning-fixes.diff of Package libcap (Revision d8ef3081d466026344cc0543a8c5c3f9)

Currently displaying revision d8ef3081d466026344cc0543a8c5c3f9 , Show latest

--- progs/execcap.c-dist	1999-04-18 00:16:31.000000000 +0200
+++ progs/execcap.c	2006-12-19 18:21:22.000000000 +0100
@@ -13,6 +13,7 @@
 #include <sys/capability.h>
 #include <unistd.h>
 #include <string.h>
+#include <stdlib.h>
 
 static void usage(void)
 {
@@ -28,7 +29,7 @@ static void usage(void)
     exit(1);
 }
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
     cap_t new_caps;
 
@@ -62,4 +63,5 @@ void main(int argc, char **argv)
     fprintf(stderr, "Unable to execute command: %s\n", strerror(errno));
 
     usage();
+    return 0;
 }
--- progs/sucap.c-dist	1999-04-18 00:16:31.000000000 +0200
+++ progs/sucap.c	2006-12-19 18:21:22.000000000 +0100
@@ -48,7 +48,7 @@ wait_on_fd(int fd)
 }
 
 
-void main(int argc, char **argv)
+int main(int argc, char **argv)
 {
     cap_t old_caps;
     uid_t uid;
@@ -193,4 +193,5 @@ void main(int argc, char **argv)
 	/* exit to signal mother process that we are ready */
 	_exit(0);
     }
+    return 0;
 }
--- libcap/cap_extint.c-dist	1999-04-18 00:16:31.000000000 +0200
+++ libcap/cap_extint.c	2006-12-19 18:21:22.000000000 +0100
@@ -91,7 +91,7 @@ cap_t cap_copy_int(const void *cap_ext)
 	(const struct cap_ext_struct *) cap_ext;
     cap_t cap_d;
     int set, blen;
-    __u32 * to = (__u32 *) &cap_d->set;
+    __u32 * to;
 
     /* Does the external representation make sense? */
     if (export == NULL || !memcmp(export->magic, external_magic
@@ -104,6 +104,7 @@ cap_t cap_copy_int(const void *cap_ext)
     if (!(cap_d = cap_init()))
        return NULL;
 
+    to = (__u32 *) &cap_d->set;
     blen = export->length_of_capset;
     for (set=0; set<=NUMBER_OF_CAP_SETS; ++set) {
 	int blk;

Places

File libcap-gcc-warning-fixes.diff of Package libcap (Revision d8ef3081d466026344cc0543a8c5c3f9)

Places