Rename freeSpec() -> rpmSpecFree() for namespacing

- librpmbuild actually now has what remotely resembles an API, after
  we broke every single thing there was ;)

diff --git a/build/parseSpec.c b/build/parseSpec.c
index a79ac34..074d337 100644 (file)
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -653,7 +653,7 @@ static rpmSpec parseSpec(const char *specFile, rpmSpecFlags flags,
            if (spec->BACount >= 1) {
                rpmSpec nspec = spec->BASpecs[0];
                spec->BASpecs = _free(spec->BASpecs);
-               spec = freeSpec(spec);
+               spec = rpmSpecFree(spec);
                spec = nspec;
            }
 
@@ -688,7 +688,7 @@ exit:
     return spec;
 
 errxit:
-    spec = freeSpec(spec);
+    spec = rpmSpecFree(spec);
     return NULL;
 }
 

diff --git a/build/rpmspec.h b/build/rpmspec.h
index 5f4331b..836123e 100644 (file)
--- a/build/rpmspec.h
+++ b/build/rpmspec.h
@@ -132,7 +132,7 @@ struct Package_s {
  * @param spec         spec file control structure
  * @return             NULL always
  */
-rpmSpec freeSpec(rpmSpec spec);
+rpmSpec rpmSpecFree(rpmSpec spec);
 
 /** \ingroup rpmbuild
  * Function to query spec file(s).

diff --git a/build/spec.c b/build/spec.c
index a0cd512..7c31808 100644 (file)
--- a/build/spec.c
+++ b/build/spec.c
@@ -248,7 +248,7 @@ rpmSpec newSpec(void)
     return spec;
 }
 
-rpmSpec freeSpec(rpmSpec spec)
+rpmSpec rpmSpecFree(rpmSpec spec)
 {
 
     if (spec == NULL) return NULL;
@@ -291,7 +291,7 @@ rpmSpec freeSpec(rpmSpec spec)
        if (spec->BASpecs != NULL)
        while (spec->BACount--) {
            spec->BASpecs[spec->BACount] =
-                       freeSpec(spec->BASpecs[spec->BACount]);
+                       rpmSpecFree(spec->BASpecs[spec->BACount]);
        }
        spec->BASpecs = _free(spec->BASpecs);
     }
@@ -332,6 +332,6 @@ int rpmspecQuery(rpmts ts, QVA_t qva, const char * arg)
        xx = qva->qva_showPackage(qva, ts, pkg->header);
 
 exit:
-    spec = freeSpec(spec);
+    spec = rpmSpecFree(spec);
     return res;
 }

diff --git a/python/spec-py.c b/python/spec-py.c
index af01e1f..1377a78 100644 (file)
--- a/python/spec-py.c
+++ b/python/spec-py.c
@@ -114,7 +114,7 @@ static void
 spec_dealloc(specObject * s) 
 {
     if (s->spec) {
-       s->spec=freeSpec(s->spec);
+       s->spec=rpmSpecFree(s->spec);
     }
     Py_TYPE(s)->tp_free((PyObject *)s);
 }

diff --git a/rpmbuild.c b/rpmbuild.c
index a03b50f..61ade84 100644 (file)
--- a/rpmbuild.c
+++ b/rpmbuild.c
@@ -301,7 +301,7 @@ static int buildForTarget(rpmts ts, const char * arg, BTA_t ba)
 
 exit:
     free(specFile);
-    freeSpec(spec);
+    rpmSpecFree(spec);
     free(buildRootURL);
     return rc;
 }