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 09:59:26
Branch: rpm-5_4 Handle: 2011041207592402
Modified files: (Branch: rpm-5_4)
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.3501.2.115+1 -0 rpm/CHANGES
2.132.2.3 +2 -2 rpm/build/parsePrep.c
1.75.2.7 +1 -1 rpm/lib/rpmfc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.114 -r1.3501.2.115 CHANGES
--- rpm/CHANGES 11 Apr 2011 23:50:41 -0000 1.3501.2.114
+++ rpm/CHANGES 12 Apr 2011 07:59:24 -0000 1.3501.2.115
@@ -1,4 +1,5 @@
5.4.0 -> 5.4.1:
+ - devzero2000: get rid of rindex everywhere: use SUSv3 strrchr instead
- jbj: mongo: templating diddle-ups, use new Date(...) in other.mongo.
- jbj: mongo: wire-up a per-spewage macro expansion, more todo++.
- jbj: mongo: fix: iconv_open("UTF-8", "UTF-8//IGNORE") zero tolerance
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePrep.c
============================================================================
$ cvs diff -u -r2.132.2.2 -r2.132.2.3 parsePrep.c
--- rpm/build/parsePrep.c 1 Jan 2011 14:39:54 -0000 2.132.2.2
+++ rpm/build/parsePrep.c 12 Apr 2011 07:59:25 -0000 2.132.2.3
@@ -237,7 +237,7 @@
return NULL;
}
- t = rindex(sp->source, '.');
+ t = strrchr(sp->source, '.');
if(t && !strcasecmp(t, ".gem"))
rubygem = 1;
@@ -493,7 +493,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.75.2.6 -r1.75.2.7 rpmfc.c
--- rpm/lib/rpmfc.c 10 Apr 2011 22:55:23 -0000 1.75.2.6
+++ rpm/lib/rpmfc.c 12 Apr 2011 07:59:26 -0000 1.75.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
