RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: lua Date: 18-Oct-2010 18:29:34
Branch: rpm-5_3 Handle: 2010101816293300
Modified files: (Branch: rpm-5_3)
lua/shadow groupadd.c useradd.c
Log:
- remove compiler warnings.
Summary:
Revision Changes Path
1.6.4.1 +2 -2 lua/shadow/groupadd.c
1.8.2.2 +2 -9 lua/shadow/useradd.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: lua/shadow/groupadd.c
============================================================================
$ cvs diff -u -r1.6 -r1.6.4.1 groupadd.c
--- lua/shadow/groupadd.c 6 Apr 2009 00:21:22 -0000 1.6
+++ lua/shadow/groupadd.c 18 Oct 2010 16:29:33 -0000 1.6.4.1
@@ -36,7 +36,7 @@
#include "system.h"
#include "shadow_config.h"
-#ident "$Id: groupadd.c,v 1.6 2009/04/06 00:21:22 jbj Exp $"
+#ident "$Id: groupadd.c,v 1.6.4.1 2010/10/18 16:29:33 jbj Exp $"
#include <ctype.h>
#include <fcntl.h>
@@ -471,7 +471,7 @@
/* field all lower level errors and exit */
- if ((retval=setjmp(lclack)) != 0) return retval;
+ if (setjmp(lclack) != 0) return -1;
{
/*
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/useradd.c
============================================================================
$ cvs diff -u -r1.8.2.1 -r1.8.2.2 useradd.c
--- lua/shadow/useradd.c 18 Oct 2010 06:24:32 -0000 1.8.2.1
+++ lua/shadow/useradd.c 18 Oct 2010 16:29:33 -0000 1.8.2.2
@@ -36,7 +36,7 @@
#include "system.h"
#include "shadow_config.h"
-#ident "$Id: useradd.c,v 1.8.2.1 2010/10/18 06:24:32 jbj Exp $"
+#ident "$Id: useradd.c,v 1.8.2.2 2010/10/18 16:29:33 jbj Exp $"
#include <getopt.h>
#include <grp.h>
@@ -1810,14 +1810,7 @@
/* field all lower level errors and exit */
- switch (retval=setjmp(lclack))
- {
- case 0: /* when calling setjmp() */
- break;
- default: /* when fielding longjmp() */
- return retval;
- }
-
+ if (setjmp(lclack)) return -1;
#ifdef WITH_AUDIT
audit_help_open ();
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
