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: 17-Jun-2007 16:41:59
Branch: rpm-4_5 Handle: 2007061715415701
Modified files: (Branch: rpm-4_5)
rpm CHANGES
rpm/lib rpmlib.h
rpm/rpmdb header.c
rpm/rpmio argv.c macro.c rpmdav.c rpmio.c rpmio.h rpmpgp.c
rpmrpc.c url.c
Log:
- refactor _free() from rpmlib.h -> rpmio.h.
Summary:
Revision Changes Path
1.1360.2.21 +1 -0 rpm/CHANGES
2.418.2.3 +0 -15 rpm/lib/rpmlib.h
1.48.2.2 +0 -12 rpm/rpmdb/header.c
1.3.2.1 +0 -12 rpm/rpmio/argv.c
2.117.2.1 +8 -13 rpm/rpmio/macro.c
2.32.2.2 +0 -13 rpm/rpmio/rpmdav.c
1.79.2.2 +0 -13 rpm/rpmio/rpmio.c
1.51.2.2 +16 -0 rpm/rpmio/rpmio.h
2.49.2.2 +0 -13 rpm/rpmio/rpmpgp.c
2.49.2.2 +0 -13 rpm/rpmio/rpmrpc.c
1.35.2.3 +0 -12 rpm/rpmio/url.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1360.2.20 -r1.1360.2.21 CHANGES
--- rpm/CHANGES 17 Jun 2007 01:11:47 -0000 1.1360.2.20
+++ rpm/CHANGES 17 Jun 2007 14:41:57 -0000 1.1360.2.21
@@ -1,4 +1,5 @@
4.4.9 -> 4.5:
+ - jbj: refactor _free() from rpmlib.h -> rpmio.h.
- jbj: add _rpmhome macro, revector helper paths through _rpmhome.
- jbj: hack a version into magic install path. better needs to be done.
- jbj: start consistent versionlibdir usage in all Makefile.am files.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
============================================================================
$ cvs diff -u -r2.418.2.2 -r2.418.2.3 rpmlib.h
--- rpm/lib/rpmlib.h 9 Jun 2007 19:08:50 -0000 2.418.2.2
+++ rpm/lib/rpmlib.h 17 Jun 2007 14:41:57 -0000 2.418.2.3
@@ -53,21 +53,6 @@
extern "C" {
#endif
-#if !defined(SWIG)
-/**
- * Wrapper to free(3), hides const compilation noise, permit NULL, return
NULL.
- * @param p memory to free
- * @return NULL always
- */
-/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/
-void * _free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL
PROTECTED]@*/ const void * p)
- /[EMAIL PROTECTED] p @*/
-{
- if (p != NULL) free((void *)p);
- return NULL;
-}
-#endif
-
/** \ingroup rpmts
* The RPM Transaction Set.
* Transaction sets are inherently unordered! RPM may reorder transaction
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/header.c
============================================================================
$ cvs diff -u -r1.48.2.1 -r1.48.2.2 header.c
--- rpm/rpmdb/header.c 9 Jun 2007 19:08:52 -0000 1.48.2.1
+++ rpm/rpmdb/header.c 17 Jun 2007 14:41:58 -0000 1.48.2.2
@@ -121,18 +121,6 @@
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
HV_t hdrVec; /* forward reference */
-/**
- * Wrapper to free(3), hides const compilation noise, permit NULL, return
NULL.
- * @param p memory to free
- * @return NULL always
- */
-/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/ void *
-_free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const void * p) /[EMAIL PROTECTED] *p @*/
-{
- if (p != NULL) free((void *)p);
- return NULL;
-}
-
/** \ingroup header
* Reference a header instance.
* @param h header
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/argv.c
============================================================================
$ cvs diff -u -r1.3 -r1.3.2.1 argv.c
--- rpm/rpmio/argv.c 25 May 2007 17:36:36 -0000 1.3
+++ rpm/rpmio/argv.c 17 Jun 2007 14:41:58 -0000 1.3.2.1
@@ -10,18 +10,6 @@
#include "debug.h"
/[EMAIL PROTECTED]@*/
-/**
- * Wrapper to free(3), hides const compilation noise, permit NULL, return
NULL.
- * @param p memory to free
- * @return NULL always
- */
-/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/
-void * _free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL
PROTECTED]@*/ const void * p)
- /[EMAIL PROTECTED] p @*/
-{
- if (p != NULL) free((void *)p);
- return NULL;
-}
void argvPrint(const char * msg, ARGV_t argv, FILE * fp)
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
============================================================================
$ cvs diff -u -r2.117 -r2.117.2.1 macro.c
--- rpm/rpmio/macro.c 25 May 2007 17:36:36 -0000 2.117
+++ rpm/rpmio/macro.c 17 Jun 2007 14:41:58 -0000 2.117.2.1
@@ -38,6 +38,14 @@
#define fdGetFILE(_fd) (_fd)
+/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/ void *
+_free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const void * p)
+ /[EMAIL PROTECTED] [EMAIL PROTECTED]/
+{
+ if (p != NULL) free((void *)p);
+ return NULL;
+}
+
#else
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
@@ -122,19 +130,6 @@
/[EMAIL PROTECTED] mb, rpmGlobalMacroContext,
print_macro_trace, print_expand_trace, fileSystem @*/;
-/**
- * Wrapper to free(3), hides const compilation noise, permit NULL, return
NULL.
- * @param p memory to free
- * @retval NULL always
- */
-/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/ void *
-_free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const void * p)
- /[EMAIL PROTECTED] [EMAIL PROTECTED]/
-{
- if (p != NULL) free((void *)p);
- return NULL;
-}
-
/* =============================================================== */
/**
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.c
============================================================================
$ cvs diff -u -r2.32.2.1 -r2.32.2.2 rpmdav.c
--- rpm/rpmio/rpmdav.c 29 May 2007 00:38:02 -0000 2.32.2.1
+++ rpm/rpmio/rpmdav.c 17 Jun 2007 14:41:58 -0000 2.32.2.2
@@ -71,19 +71,6 @@
/[EMAIL PROTECTED]@*/
static int httpTimeoutSecs = TIMEOUT_SECS;
-/**
- * Wrapper to free(3), hides const compilation noise, permit NULL, return
NULL.
- * @param p memory to free
- * @retval NULL always
- */
-/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/ void *
-_free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const void * p)
- /[EMAIL PROTECTED] [EMAIL PROTECTED]/
-{
- if (p != NULL) free((void *)p);
- return NULL;
-}
-
/* =============================================================== */
int davFree(urlinfo u)
/[EMAIL PROTECTED] internalState @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
============================================================================
$ cvs diff -u -r1.79.2.1 -r1.79.2.2 rpmio.c
--- rpm/rpmio/rpmio.c 9 Jun 2007 15:47:56 -0000 1.79.2.1
+++ rpm/rpmio/rpmio.c 17 Jun 2007 14:41:58 -0000 1.79.2.2
@@ -161,19 +161,6 @@
/[EMAIL PROTECTED]@*/
int _dav_debug = 0;
-/**
- * Wrapper to free(3), hides const compilation noise, permit NULL, return
NULL.
- * @param p memory to free
- * @retval NULL always
- */
-/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/ void *
-_free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const void * p)
- /[EMAIL PROTECTED] [EMAIL PROTECTED]/
-{
- if (p != NULL) free((void *)p);
- return NULL;
-}
-
/* =============================================================== */
/[EMAIL PROTECTED]@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.h
============================================================================
$ cvs diff -u -r1.51.2.1 -r1.51.2.2 rpmio.h
--- rpm/rpmio/rpmio.h 25 May 2007 19:00:39 -0000 1.51.2.1
+++ rpm/rpmio/rpmio.h 17 Jun 2007 14:41:58 -0000 1.51.2.2
@@ -835,6 +835,22 @@
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const char * xstrtolocale(/[EMAIL PROTECTED]@*/ const char *str)
/[EMAIL PROTECTED] *str @*/;
+
+#if !defined(SWIG)
+/**
+ * Wrapper to free(3), hides const compilation noise, permit NULL, return
NULL.
+ * @param p memory to free
+ * @return NULL always
+ */
+/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/
+void * _free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL
PROTECTED]@*/ const void * p)
+ /[EMAIL PROTECTED] p @*/
+{
+ if (p != NULL) free((void *)p);
+ return NULL;
+}
+#endif
+
#ifdef __cplusplus
}
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpgp.c
============================================================================
$ cvs diff -u -r2.49.2.1 -r2.49.2.2 rpmpgp.c
--- rpm/rpmio/rpmpgp.c 9 Jun 2007 19:08:54 -0000 2.49.2.1
+++ rpm/rpmio/rpmpgp.c 17 Jun 2007 14:41:58 -0000 2.49.2.2
@@ -262,19 +262,6 @@
{ -1, "Unknown armor key" }
};
-/**
- * Wrapper to free(3), hides const compilation noise, permit NULL, return
NULL.
- * @param p memory to free
- * @return NULL always
- */
-/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/ void *
-_free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const void * p)
- /[EMAIL PROTECTED] p @*/
-{
- if (p != NULL) free((void *)p);
- return NULL;
-}
-
static void pgpPrtNL(void)
/[EMAIL PROTECTED] fileSystem @*/
/[EMAIL PROTECTED] fileSystem @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmrpc.c
============================================================================
$ cvs diff -u -r2.49.2.1 -r2.49.2.2 rpmrpc.c
--- rpm/rpmio/rpmrpc.c 9 Jun 2007 19:08:54 -0000 2.49.2.1
+++ rpm/rpmio/rpmrpc.c 17 Jun 2007 14:41:58 -0000 2.49.2.2
@@ -20,19 +20,6 @@
/[EMAIL PROTECTED] FD_t @*/
/[EMAIL PROTECTED] urlinfo @*/
-/**
- * Wrapper to free(3), hides const compilation noise, permit NULL, return
NULL.
- * @param p memory to free
- * @retval NULL always
- */
-/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/ void *
-_free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
const void * p)
- /[EMAIL PROTECTED] [EMAIL PROTECTED]/
-{
- if (p != NULL) free((void *)p);
- return NULL;
-}
-
/* =============================================================== */
static int ftpMkdir(const char * path, /[EMAIL PROTECTED]@*/ mode_t mode)
/[EMAIL PROTECTED] h_errno, fileSystem, internalState @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/url.c
============================================================================
$ cvs diff -u -r1.35.2.2 -r1.35.2.3 url.c
--- rpm/rpmio/url.c 9 Jun 2007 15:47:56 -0000 1.35.2.2
+++ rpm/rpmio/url.c 17 Jun 2007 14:41:58 -0000 1.35.2.3
@@ -54,18 +54,6 @@
/[EMAIL PROTECTED]@*/
int _url_count = 0;
-/**
- * Wrapper to free(3), hides const compilation noise, permit NULL, return
NULL.
- * @param p memory to free
- * @retval NULL always
- */
-/[EMAIL PROTECTED]@*/ static inline /[EMAIL PROTECTED]@*/ void *
-_free(/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const void * p) /[EMAIL
PROTECTED] [EMAIL PROTECTED]/
-{
- if (p != NULL) free((void *)p);
- return NULL;
-}
-
urlinfo XurlLink(urlinfo u, const char *msg, const char *file, unsigned line)
{
URLSANE(u);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
