RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 09-Nov-2007 22:23:51
Branch: HEAD Handle: 2007110921235100
Modified files:
rpm CHANGES
rpm/lib rpmrc.c
Log:
- rpm.org: Remove useless "var" parameter from setup helpers.
Summary:
Revision Changes Path
1.1785 +1 -0 rpm/CHANGES
2.215 +15 -16 rpm/lib/rpmrc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1784 -r1.1785 CHANGES
--- rpm/CHANGES 9 Nov 2007 21:18:43 -0000 1.1784
+++ rpm/CHANGES 9 Nov 2007 21:23:51 -0000 1.1785
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - rpm.org: Remove useless "var" parameter from setup helpers.
- rpm.org: Remove dead & unused RPMTAG_ARCHIVESIZE addition code ...
- rpm.org: Remove rpmSetMachine() from API.
- jbj: hmmm, headerGetExtension should not leak memory on failure. hack
it.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.214 -r2.215 rpmrc.c
--- rpm/lib/rpmrc.c 9 Nov 2007 21:15:45 -0000 2.214
+++ rpm/lib/rpmrc.c 9 Nov 2007 21:23:51 -0000 2.215
@@ -231,7 +231,7 @@
return name;
}
-static void setVarDefault(/[EMAIL PROTECTED]@*/ int var, const char *
macroname,
+static void addMacroDefault(const char * macroname,
const char * val, /[EMAIL PROTECTED]@*/ const char * body)
/[EMAIL PROTECTED] rpmGlobalMacroContext, internalState @*/
/[EMAIL PROTECTED] rpmGlobalMacroContext, internalState @*/
@@ -241,8 +241,7 @@
addMacro(NULL, macroname, NULL, body, RMIL_DEFAULT);
}
-static void setPathDefault(/[EMAIL PROTECTED]@*/ int var, const char *
macroname,
- const char * subdir)
+static void setPathDefault(const char * macroname, const char * subdir)
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, internalState @*/
/[EMAIL PROTECTED] rpmGlobalMacroContext, internalState @*/
{
@@ -285,30 +284,30 @@
addMacro(NULL, "___build_pre", NULL, ___build_pre, RMIL_DEFAULT);
- setVarDefault(-1, "_topdir",
+ addMacroDefault("_topdir",
"%{_usr}/src/rpm", NULL);
- setVarDefault(-1, "_tmppath",
+ addMacroDefault("_tmppath",
"%{_var}/tmp", NULL);
- setVarDefault(-1, "_dbpath",
+ addMacroDefault("_dbpath",
"%{_var}/lib/rpm", NULL);
- setVarDefault(-1, "_defaultdocdir",
+ addMacroDefault("_defaultdocdir",
"%{_usr}/share/doc", NULL);
- setVarDefault(-1, "_rpmfilename",
+ addMacroDefault("_rpmfilename",
"%%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm",NULL);
- setVarDefault(-1, "optflags",
+ addMacroDefault("optflags",
"-O2 -g", NULL);
- setVarDefault(-1, "sigtype",
+ addMacroDefault("sigtype",
"none", NULL);
- setVarDefault(-1, "_buildshell",
+ addMacroDefault("_buildshell",
"/bin/sh", NULL);
- setPathDefault(-1, "_builddir", "BUILD");
- setPathDefault(-1, "_rpmdir", "RPMS");
- setPathDefault(-1, "_srcrpmdir", "SRPMS");
- setPathDefault(-1, "_sourcedir", "SOURCES");
- setPathDefault(-1, "_specdir", "SPECS");
+ setPathDefault("_builddir", "BUILD");
+ setPathDefault("_rpmdir", "RPMS");
+ setPathDefault("_srcrpmdir", "SRPMS");
+ setPathDefault("_sourcedir", "SOURCES");
+ setPathDefault("_specdir", "SPECS");
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
