RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 12-Apr-2011 10:02:30
Branch: rpm-5_3 Handle: 2011041208022901
Modified files: (Branch: rpm-5_3)
rpm CHANGES
rpm/build parsePrep.c
rpm/lib rpmfc.c
Log:
get rid of rindex everywhere: use SUSv3 strrchr instead
Summary:
Revision Changes Path
1.3296.2.212+1 -0 rpm/CHANGES
2.130.4.3 +2 -2 rpm/build/parsePrep.c
1.73.2.7 +1 -1 rpm/lib/rpmfc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.211 -r1.3296.2.212 CHANGES
--- rpm/CHANGES 11 Apr 2011 14:36:54 -0000 1.3296.2.211
+++ rpm/CHANGES 12 Apr 2011 08:02:29 -0000 1.3296.2.212
@@ -1,4 +1,5 @@
5.3.10 -> 5.3.11
+ - devzero2000: get rid of rindex everywhere: use SUSv3 strrchr instead
- devzero2000: add more gpg keys to thkp.c test program
- jbj: verify: re-add digest/signature checks.
- jbj: move multiarch* to mandriva.in.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePrep.c
============================================================================
$ cvs diff -u -r2.130.4.2 -r2.130.4.3 parsePrep.c
--- rpm/build/parsePrep.c 13 Dec 2010 19:18:33 -0000 2.130.4.2
+++ rpm/build/parsePrep.c 12 Apr 2011 08:02:30 -0000 2.130.4.3
@@ -236,7 +236,7 @@
return NULL;
}
- t = rindex(sp->source, '.');
+ t = strrchr(sp->source, '.');
if(t && !strcasecmp(t, ".gem"))
rubygem = 1;
@@ -491,7 +491,7 @@
}
}
if (sp != NULL) {
- char *t = rindex(sp->source, '.');
+ char *t = strrchr(sp->source, '.');
if(t && !strcasecmp(t, ".gem"))
createDir = 1;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.73.2.6 -r1.73.2.7 rpmfc.c
--- rpm/lib/rpmfc.c 10 Apr 2011 22:57:27 -0000 1.73.2.6
+++ rpm/lib/rpmfc.c 12 Apr 2011 08:02:30 -0000 1.73.2.7
@@ -1104,7 +1104,7 @@
else if (!strncmp(fn, "/ruby", sizeof("/ruby")-1)) {
fc->fcolor->vals[fc->ix] |= RPMFC_RUBY;
if ((fn = strstr(fn, "/specifications/")) &&
- (fn = rindex(fn, '.')) && !strcmp(fn, ".gemspec"))
+ (fn = strrchr(fn, '.')) && !strcmp(fn, ".gemspec"))
fc->fcolor->vals[fc->ix] |= RPMFC_MODULE;
}
/* XXX: lacking better, more generic classifier... */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
