[CVS] RPM: lua/chkconfig/ chkconfig.c leveldb.c lua/shadow/ useradd.c
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 08:24:16
Branch: HEAD Handle: 2010101806241600
Modified files:
lua/chkconfig chkconfig.c leveldb.c
lua/shadow useradd.c
Log:
- remove some compiler warnings.
Summary:
RevisionChanges Path
1.7 +2 -1 lua/chkconfig/chkconfig.c
1.3 +6 -5 lua/chkconfig/leveldb.c
1.9 +7 -4 lua/shadow/useradd.c
patch -p0 <<'@@ .'
Index: lua/chkconfig/chkconfig.c
$ cvs diff -u -r1.6 -r1.7 chkconfig.c
--- lua/chkconfig/chkconfig.c 4 Apr 2010 07:59:35 - 1.6
+++ lua/chkconfig/chkconfig.c 18 Oct 2010 06:24:16 - 1.7
@@ -550,10 +550,11 @@
}
return rc;
} else if (s.type == TYPE_XINETD) {
+ int xx;
if (setXinetdService(s, state)) {
return 1;
}
- (void) system("/etc/init.d/xinetd reload >/dev/null 2>&1");
+ xx =system("/etc/init.d/xinetd reload >/dev/null 2>&1");
}
return 0;
@@ .
patch -p0 <<'@@ .'
Index: lua/chkconfig/leveldb.c
$ cvs diff -u -r1.2 -r1.3 leveldb.c
--- lua/chkconfig/leveldb.c 21 Mar 2010 14:56:59 - 1.2
+++ lua/chkconfig/leveldb.c 18 Oct 2010 06:24:16 - 1.3
@@ -54,7 +54,7 @@
return rc;
}
-int readDescription(char *start, char *bufstop, char **english_desc, char
**serv_desc) {
+static int readDescription(char *start, char *bufstop, char **english_desc,
char **serv_desc) {
char english;
char my_lang_loaded = 0;
char is_my_lang = 0;
@@ -695,12 +695,13 @@
}
while (isspace(*buf)) buf++;
if (strncmp(buf,"disable", 7) && strlen(buf)) {
- (void) write(newfd,tmp,strlen(tmp));
- (void) write(newfd,"\n",1);
+ int xx;
+ xx = write(newfd,tmp,strlen(tmp));
+ xx = write(newfd,"\n",1);
if (buf[0] == '{') {
snprintf(tmpstr,50,"\tdisable\t= %s", on ? "no"
: "yes");
- (void) write(newfd,tmpstr,strlen(tmpstr));
- (void) write(newfd,"\n",1);
+ xx = write(newfd,tmpstr,strlen(tmpstr));
+ xx = write(newfd,"\n",1);
}
}
buf = ptr;
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/useradd.c
$ cvs diff -u -r1.8 -r1.9 useradd.c
--- lua/shadow/useradd.c 21 Mar 2010 14:56:59 - 1.8
+++ lua/shadow/useradd.c 18 Oct 2010 06:24:16 - 1.9
@@ -36,7 +36,7 @@
#include "system.h"
#include "shadow_config.h"
-#ident "$Id: useradd.c,v 1.8 2010/03/21 14:56:59 jbj Exp $"
+#ident "$Id: useradd.c,v 1.9 2010/10/18 06:24:16 jbj Exp $"
#include
#include
@@ -1579,9 +1579,10 @@
fd = open (FAILLOG_FILE, O_RDWR);
if (fd >= 0) {
+ int xx;
memzero (&fl, sizeof (fl));
lseek (fd, (off_t) sizeof (fl) * uid, SEEK_SET);
- (void) write (fd, &fl, sizeof (fl));
+ xx = write (fd, &fl, sizeof (fl));
close (fd);
}
}
@@ -1593,9 +1594,10 @@
fd = open (LASTLOG_FILE, O_RDWR);
if (fd >= 0) {
+ int xx;
memzero (&ll, sizeof (ll));
lseek (fd, (off_t) sizeof (ll) * uid, SEEK_SET);
- (void) write (fd, &ll, sizeof (ll));
+ xx = write (fd, &ll, sizeof (ll));
close (fd);
}
}
@@ -1686,6 +1688,7 @@
static void create_home (void)
{
if (access (user_home, F_OK)) {
+ int xx;
/* XXX - create missing parent directories. --marekm */
if (mkdir (user_home, 0)) {
fprintf (stderr,
@@ -1698,7 +1701,7 @@
#endif
fail_exit (E_HOMEDIR);
}
- (void) chown (user_home, user_id, user_gid);
+ xx = chown (user_home, user_id, user_gid);
chmod (user_home,
0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK));
home_added++;
@@ .
__
[CVS] RPM: lua/chkconfig/ chkconfig.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: lua Date: 04-Apr-2010 09:59:35
Branch: HEAD Handle: 2010040407593500
Modified files:
lua/chkconfig chkconfig.c
Log:
fix casts, to work with C too
Summary:
RevisionChanges Path
1.6 +3 -3 lua/chkconfig/chkconfig.c
patch -p0 <<'@@ .'
Index: lua/chkconfig/chkconfig.c
$ cvs diff -u -r1.5 -r1.6 chkconfig.c
--- lua/chkconfig/chkconfig.c 21 Mar 2010 14:56:58 - 1.5
+++ lua/chkconfig/chkconfig.c 4 Apr 2010 07:59:35 - 1.6
@@ -211,7 +211,7 @@
}
if (!S_ISREG(sb.st_mode)) continue;
if (!strcmp(ent->d_name, s->name)) continue;
- servs = (service *) realloc(servs, (numservs+1) * sizeof(struct
service));
+ servs = (struct service *) realloc(servs, (numservs+1) *
sizeof(struct service));
if (!readServiceInfo(ent->d_name, servs + numservs, 0))
numservs++;
}
@@ -473,7 +473,7 @@
}
numServices = 0;
numServicesAlloced = 10;
- s = (service *) malloc(sizeof (*s) * numServicesAlloced);
+ s = (struct service *) malloc(sizeof (*s) * numServicesAlloced);
while ((ent = readdir(dir))) {
const char *dn;
@@ -492,7 +492,7 @@
if (numServices == numServicesAlloced) {
numServicesAlloced += 10;
- s = (service *) realloc(s, numServicesAlloced *
sizeof (*s));
+ s = (struct service *) realloc(s,
numServicesAlloced * sizeof (*s));
}
if (readXinetdServiceInfo(ent->d_name, s + numServices, 0)
!= -1)
numServices ++;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: lua/chkconfig/ chkconfig.c leveldb.c lua/local/ lposix.c lr...
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: 21-Mar-2010 15:57:00
Branch: HEAD Handle: 2010032114565801
Modified files:
lua/chkconfig chkconfig.c leveldb.c
lua/local lposix.c lrexlib_lpcre.c lrexlib_lpcre_f.c
lua/shadow commonio.c copydir.c groupio.c gshadow.c pwio.c
sgetgrent.c sgroupio.c shadowio.c strtoday.c
useradd.c
Log:
- c++: compilation fixes.
Summary:
RevisionChanges Path
1.5 +10 -10 lua/chkconfig/chkconfig.c
1.2 +17 -17 lua/chkconfig/leveldb.c
1.14+12 -12 lua/local/lposix.c
1.3 +1 -1 lua/local/lrexlib_lpcre.c
1.3 +0 -1 lua/local/lrexlib_lpcre_f.c
1.3 +7 -7 lua/shadow/commonio.c
1.4 +2 -2 lua/shadow/copydir.c
1.4 +7 -7 lua/shadow/groupio.c
1.4 +4 -4 lua/shadow/gshadow.c
1.4 +7 -7 lua/shadow/pwio.c
1.4 +5 -5 lua/shadow/sgetgrent.c
1.4 +7 -7 lua/shadow/sgroupio.c
1.4 +7 -7 lua/shadow/shadowio.c
1.7 +3 -3 lua/shadow/strtoday.c
1.8 +9 -8 lua/shadow/useradd.c
patch -p0 <<'@@ .'
Index: lua/chkconfig/chkconfig.c
$ cvs diff -u -r1.4 -r1.5 chkconfig.c
--- lua/chkconfig/chkconfig.c 6 Apr 2009 00:21:22 - 1.4
+++ lua/chkconfig/chkconfig.c 21 Mar 2010 14:56:58 - 1.5
@@ -211,7 +211,7 @@
}
if (!S_ISREG(sb.st_mode)) continue;
if (!strcmp(ent->d_name, s->name)) continue;
- servs = realloc(servs, (numservs+1) * sizeof(struct service));
+ servs = (service *) realloc(servs, (numservs+1) * sizeof(struct
service));
if (!readServiceInfo(ent->d_name, servs + numservs, 0))
numservs++;
}
@@ -385,8 +385,8 @@
}
static int xinetdNameCmp(const void * a, const void * b) {
-const struct service * first = a;
-const struct service * second = b;
+const struct service * first = (const struct service *) a;
+const struct service * second = (const struct service *) b;
return strcmp(first->name, second->name);
}
@@ -407,7 +407,7 @@
if (item) return showServiceInfo(item, 0);
numServicesAlloced = 10;
-services = malloc(sizeof(*services) * numServicesAlloced);
+services = (char **) malloc(sizeof(*services) * numServicesAlloced);
if (!(dir = opendir(RUNLEVELS "/init.d"))) {
fprintf(stderr, _("failed to open %s/init.d: %s\n"), RUNLEVELS,
@@ -440,10 +440,10 @@
if (numServices == numServicesAlloced) {
numServicesAlloced += 10;
- services = realloc(services, numServicesAlloced *
sizeof(*services));
+ services = (char **) realloc(services, numServicesAlloced *
sizeof(*services));
}
- services[numServices] = alloca(strlen(ent->d_name) + 1);
+ services[numServices] = (char *) alloca(strlen(ent->d_name) + 1);
strncpy(services[numServices++], ent->d_name, strlen(ent->d_name) + 1);
}
@@ -473,7 +473,7 @@
}
numServices = 0;
numServicesAlloced = 10;
- s = malloc(sizeof (*s) * numServicesAlloced);
+ s = (service *) malloc(sizeof (*s) * numServicesAlloced);
while ((ent = readdir(dir))) {
const char *dn;
@@ -492,7 +492,7 @@
if (numServices == numServicesAlloced) {
numServicesAlloced += 10;
- s = realloc(s, numServicesAlloced * sizeof (*s));
+ s = (service *) realloc(s, numServicesAlloced *
sizeof (*s));
}
if (readXinetdServiceInfo(ent->d_name, s + numServices, 0)
!= -1)
numServices ++;
@@ -501,7 +501,7 @@
qsort(s, numServices, sizeof(*s), xinetdNameCmp);
t = s;
for (i = 0; i < numServices; i++, s++) {
- char *tmp = malloc(strlen(s->name) + 5);
+ char *tmp = (char *) malloc(strlen(s->name) + 5);
sprintf(tmp,"%s:",s->name);
printf("\t%-15s\t%s\n", tmp, s->levels ? _("on") :
_("off"));
}
@@ -553,7 +553,7 @@
if (setXinetdService(s, state)) {
return 1
[CVS] RPM: lua/chkconfig/ chkconfig.c lua/shadow/ groupadd.c useradd.c...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm lua Date: 06-Apr-2009 02:21:23
Branch: HEAD Handle: 2009040600212003
Modified files:
lua/chkconfig chkconfig.c
lua/shadow groupadd.c useradd.c
rpm VENDOR rpmpopt.in rpmqv.c
rpm/build parsePreamble.c rpmspec.h
rpm/lib depends.c poptALL.c poptI.c poptQV.c query.c
rpmfc.c rpmfi.c rpmfi.h rpmps.c rpmte.c rpmts.c
rpm/rpmdb rpmdb.c
rpm/rpmio iosm.c lsyck.c poptIO.c rpmdav.c rpmdav.h
rpmhash.h rpmtar.c url.c
rpm/tools rpmmtree.c
Log:
- jbj: forward port fiddle-ups seen while backporting.
Summary:
RevisionChanges Path
1.4 +3 -1 lua/chkconfig/chkconfig.c
1.6 +2 -1 lua/shadow/groupadd.c
1.7 +2 -1 lua/shadow/useradd.c
2.68+11 -0 rpm/VENDOR
2.190 +1 -1 rpm/build/parsePreamble.c
2.79+4 -2 rpm/build/rpmspec.h
1.441 +0 -8 rpm/lib/depends.c
2.120 +1 -1 rpm/lib/poptALL.c
2.53+1 -0 rpm/lib/poptI.c
2.64+2 -0 rpm/lib/poptQV.c
2.212 +2 -1 rpm/lib/query.c
1.64+7 -6 rpm/lib/rpmfc.c
2.148 +6 -6 rpm/lib/rpmfi.c
2.75+0 -1 rpm/lib/rpmfi.h
2.34+6 -6 rpm/lib/rpmps.c
2.102 +2 -3 rpm/lib/rpmte.c
2.168 +2 -2 rpm/lib/rpmts.c
1.291 +1 -1 rpm/rpmdb/rpmdb.c
1.38+1 -1 rpm/rpmio/iosm.c
2.4 +2 -1 rpm/rpmio/lsyck.c
1.36+1 -1 rpm/rpmio/poptIO.c
2.99+4 -3 rpm/rpmio/rpmdav.c
2.37+1 -1 rpm/rpmio/rpmdav.h
1.11+1 -1 rpm/rpmio/rpmhash.h
1.28+1 -1 rpm/rpmio/rpmtar.c
1.70+1 -1 rpm/rpmio/url.c
2.83+3 -3 rpm/rpmpopt.in
1.158 +6 -6 rpm/rpmqv.c
2.8 +3 -3 rpm/tools/rpmmtree.c
patch -p0 <<'@@ .'
Index: lua/chkconfig/chkconfig.c
$ cvs diff -u -r1.3 -r1.4 chkconfig.c
--- lua/chkconfig/chkconfig.c 17 Nov 2008 14:21:15 - 1.3
+++ lua/chkconfig/chkconfig.c 6 Apr 2009 00:21:22 - 1.4
@@ -559,7 +559,9 @@
return 0;
}
-int chkconfig_main(int argc, const char ** argv) {
+int chkconfig_main(int argc, const char ** argv);
+int chkconfig_main(int argc, const char ** argv)
+{
int listItem = 0, addItem = 0, delItem = 0, overrideItem = 0;
int rc, i, x;
int LSB = 0;
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/groupadd.c
$ cvs diff -u -r1.5 -r1.6 groupadd.c
--- lua/shadow/groupadd.c 17 Nov 2008 14:21:14 - 1.5
+++ lua/shadow/groupadd.c 6 Apr 2009 00:21:22 - 1.6
@@ -36,7 +36,7 @@
#include "system.h"
#include "shadow_config.h"
-#ident "$Id: groupadd.c,v 1.5 2008/11/17 14:21:14 jbj Exp $"
+#ident "$Id: groupadd.c,v 1.6 2009/04/06 00:21:22 jbj Exp $"
#include
#include
@@ -431,6 +431,7 @@
* main - groupadd command
*/
+int groupadd_main (int argc, char **argv);
int groupadd_main (int argc, char **argv)
{
struct stat s;
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/useradd.c
$ cvs diff -u -r1.6 -r1.7 useradd.c
--- lua/shadow/useradd.c 17 Nov 2008 14:21:14 - 1.6
+++ lua/shadow/useradd.c 6 Apr 2009 00:21:22 - 1.7
@@ -36,7 +36,7 @@
#include "system.h"
#include "shadow_config.h"
-#ident "$Id: useradd.c,v 1.6 2008/11/17 14:21:14 jbj Exp $"
+#ident "$Id: useradd.c,v 1.7 2009/04/06 00:21:22 jbj Exp $"
#include
#include
@@ -1756,6 +1756,7 @@
/*
* main - useradd command
*/
+int useradd_main (int argc, char **argv);
int useradd_main (int argc, char **argv)
{
struct stat s;
@@ .
patch -p0 <<'@@ .'
Index: rpm/VENDOR
$ cvs diff -u -r2.67 -r2.68 VENDOR
--- rpm/VENDOR18 Jan 2009 04:00:03 - 2.67
+++ rpm/VENDOR6 Apr 2009 00:21:20 - 2.68
@@ -601,3 +601,14 @@
Change: rpm-epoch0
Purpose:Explictly add Epoch: 0 in all packages.
[CVS] RPM: lua/chkconfig/ chkconfig.c lua/shadow/ groupadd.c useradd.c...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm lua Date: 17-Nov-2008 15:21:15
Branch: HEAD Handle: 2008111714211401
Modified files:
lua/chkconfig chkconfig.c
lua/shadow groupadd.c useradd.c
rpm CHANGES
Log:
- WR: lua: display "rpm:lua:foo" progname w chkconfig/useradd/groupadd
errors.
Summary:
RevisionChanges Path
1.3 +2 -2 lua/chkconfig/chkconfig.c
1.5 +2 -2 lua/shadow/groupadd.c
1.6 +2 -2 lua/shadow/useradd.c
1.2652 +2 -0 rpm/CHANGES
patch -p0 <<'@@ .'
Index: lua/chkconfig/chkconfig.c
$ cvs diff -u -r1.2 -r1.3 chkconfig.c
--- lua/chkconfig/chkconfig.c 18 Aug 2008 19:16:10 - 1.2
+++ lua/chkconfig/chkconfig.c 17 Nov 2008 14:21:15 - 1.3
@@ -27,7 +27,7 @@
#include
#include
-static const char *progname;
+static const char *progname = "rpm:lua:chkconfig";
#define _(String) gettext((String))
@@ -579,6 +579,7 @@
{ 0, 0, 0, 0, 0 }
};
+#if 0
if ((progname = strrchr(argv[0], '/')) != NULL)
progname++;
else
@@ -592,7 +593,6 @@
LSB++;
}
-#if 0
setlocale(LC_ALL, "");
bindtextdomain("chkconfig","/usr/share/locale");
textdomain("chkconfig");
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/groupadd.c
$ cvs diff -u -r1.4 -r1.5 groupadd.c
--- lua/shadow/groupadd.c 18 Aug 2008 19:16:10 - 1.4
+++ lua/shadow/groupadd.c 17 Nov 2008 14:21:14 - 1.5
@@ -36,7 +36,7 @@
#include "system.h"
#include "shadow_config.h"
-#ident "$Id: groupadd.c,v 1.4 2008/08/18 19:16:10 jbj Exp $"
+#ident "$Id: groupadd.c,v 1.5 2008/11/17 14:21:14 jbj Exp $"
#include
#include
@@ -85,7 +85,7 @@
static gid_t group_id;
static char *empty_list = NULL;
-static char *Prog;
+static char *Prog = "rpm:lua:wrs.groupadd";
static int oflg = 0; /* permit non-unique group ID to be specified
with -g */
static int gflg = 0; /* ID value for the new group */
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/useradd.c
$ cvs diff -u -r1.5 -r1.6 useradd.c
--- lua/shadow/useradd.c 27 Oct 2008 00:38:26 - 1.5
+++ lua/shadow/useradd.c 17 Nov 2008 14:21:14 - 1.6
@@ -36,7 +36,7 @@
#include "system.h"
#include "shadow_config.h"
-#ident "$Id: useradd.c,v 1.5 2008/10/27 00:38:26 jbj Exp $"
+#ident "$Id: useradd.c,v 1.6 2008/11/17 14:21:14 jbj Exp $"
#include
#include
@@ -117,7 +117,7 @@
static long sys_ngroups;
static int do_grp_update = 0;/* group files need to be updated */
-static char *Prog;
+static char *Prog = "rpm:lua:wrs.useradd";
static int
bflg = 0, /* new default root of home directory */
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2651 -r1.2652 CHANGES
--- rpm/CHANGES 17 Nov 2008 14:12:52 - 1.2651
+++ rpm/CHANGES 17 Nov 2008 14:21:14 - 1.2652
@@ -1,5 +1,7 @@
5.2a2 -> 5.2a3:
+- jbj: WR: lua: display "rpm:lua:foo" progname w
chkconfig/useradd/groupadd
+ errors.
- jbj: WR: fix: sqlite assertion failure while sequentially retrieving
keys.
- bero: Ark: create --with-vendor=ark, borrow some Mandriva patches, add
use-gnu-tar-compression-detection patch for vendor ark
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: lua/chkconfig/ chkconfig.c lua/shadow/ fputsx.c groupadd.c ...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm lua Date: 18-Aug-2008 21:16:11
Branch: HEAD Handle: 2008081819160901
Modified files:
lua/chkconfig chkconfig.c
lua/shadow fputsx.c groupadd.c groupio.c gshadow.c list.c
prototypes.h pwio.c sgetgrent.c sgetpwent.c
sgroupio.c shadowio.c strtoday.c useradd.c
rpm CHANGES
Log:
- jbj: WR: eliminate most compiler warnings.
Summary:
RevisionChanges Path
1.2 +7 -7 lua/chkconfig/chkconfig.c
1.3 +3 -2 lua/shadow/fputsx.c
1.4 +4 -4 lua/shadow/groupadd.c
1.3 +4 -1 lua/shadow/groupio.c
1.3 +1 -4 lua/shadow/gshadow.c
1.3 +5 -3 lua/shadow/list.c
1.3 +7 -1 lua/shadow/prototypes.h
1.3 +4 -1 lua/shadow/pwio.c
1.3 +4 -2 lua/shadow/sgetgrent.c
1.3 +3 -2 lua/shadow/sgetpwent.c
1.3 +4 -2 lua/shadow/sgroupio.c
1.3 +4 -2 lua/shadow/shadowio.c
1.4 +3 -2 lua/shadow/strtoday.c
1.4 +11 -11 lua/shadow/useradd.c
1.2527 +1 -0 rpm/CHANGES
patch -p0 <<'@@ .'
Index: lua/chkconfig/chkconfig.c
$ cvs diff -u -r1.1 -r1.2 chkconfig.c
--- lua/chkconfig/chkconfig.c 17 Aug 2008 18:31:35 - 1.1
+++ lua/chkconfig/chkconfig.c 18 Aug 2008 19:16:10 - 1.2
@@ -27,7 +27,7 @@
#include
#include
-static char *progname;
+static const char *progname;
#define _(String) gettext((String))
@@ -74,7 +74,7 @@
if (!findServiceEntries(name, level, &globres)) {
- for (i = 0; i < globres.gl_pathc; i++)
+ for (i = 0; i < (int)globres.gl_pathc; i++)
unlink(globres.gl_pathv[i]);
if (globres.gl_pathc) globfree(&globres);
}
@@ -94,7 +94,7 @@
for (level = 0; level < 7; level++) {
if (!findServiceEntries(name, level, &globres)) {
- for (i = 0; i < globres.gl_pathc; i++)
+ for (i = 0; i < (int)globres.gl_pathc; i++)
unlink(globres.gl_pathv[i]);
if (globres.gl_pathc) globfree(&globres);
}
@@ -313,7 +313,7 @@
if (configured && doChange) {
for (level = 0; level < 7; level++) {
if (!findServiceEntries(name, level, &globres)) {
-for (i = 0; i < globres.gl_pathc; i++)
+for (i = 0; i < (int)globres.gl_pathc; i++)
unlink(globres.gl_pathv[i]);
if (globres.gl_pathc)
globfree(&globres);
@@ -366,7 +366,7 @@
return 0;
}
-static int isXinetdEnabled() {
+static int isXinetdEnabled(void) {
int i;
struct service s;
@@ -511,7 +511,7 @@
return 0;
}
-int setService(char * name, int where, int state) {
+static int setService(char * name, int where, int state) {
int i, rc;
int what;
struct service s;
@@ -559,7 +559,7 @@
return 0;
}
-int chkconfig_main(int argc, char ** argv) {
+int chkconfig_main(int argc, const char ** argv) {
int listItem = 0, addItem = 0, delItem = 0, overrideItem = 0;
int rc, i, x;
int LSB = 0;
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/fputsx.c
$ cvs diff -u -r1.2 -r1.3 fputsx.c
--- lua/shadow/fputsx.c 18 Aug 2008 17:27:43 - 1.2
+++ lua/shadow/fputsx.c 18 Aug 2008 19:16:10 - 1.3
@@ -35,11 +35,12 @@
#include "system.h"
#include "shadow_config.h"
+#include "defines.h"
+#include "prototypes.h"
#include
-#include "defines.h"
-#ident "$Id: fputsx.c,v 1.2 2008/08/18 17:27:43 jbj Exp $"
+#ident "$Id: fputsx.c,v 1.3 2008/08/18 19:16:10 jbj Exp $"
char *fgetsx (char *buf, int cnt, FILE * f)
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/groupadd.c
$ cvs diff -u -r1.3 -r1.4 groupadd.c
--- lua/shadow/groupadd.c 18 Aug 2008 17:27:43 - 1.3
+++ lua/shadow/groupadd.c 18 Aug 2008 19:16:10 - 1.4
@@ -36,7 +36,7 @@
#include "system.h"
#include "shadow_config.h"
-#ident "$Id: groupadd.c,v 1.3 2008/08/18 17:27:43 jbj Exp $"
+#ide
