remove dupstr and readopts

diff --git a/lib/zpm.c b/lib/zpm.c
index 9eb69c286b568e01708bbb707cb36f8434ebeee4..ebe89096bfa91f0ee88728b78088761f141ece3f 100644 (file)
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -114,18 +114,6 @@ void uncompresslzma(void *buf, size_t bufsize, FILE *out);
 #define SQLERROR(x) fprintf(stderr, "%s %d: %s\n", __func__, __LINE__, (x))
 #endif
 
-static char *dupstr(char *s) {
-       size_t n;
-       char *d;
-
-       n = strlen(s);
-       d = malloc(n+1);
-       if (d) {
-               d = strcpy(d, s);
-       }
-       return d;
-}
-
 #if 0
 int zpm_newpkg(struct zpm *z, char *base, char *version, int release) {
        char *sql = "insert or ignore into packages (package,version,release) values (?,?,?)";
@@ -430,37 +418,6 @@ int zpm_addvercmp(struct zpm *pkg) {
                        );
 }
 
-/* set package struct variables, database, environment, then command line */
-int zpm_readopts(struct zpm *zpm, int ac, char **av) {
-       char *ev;
-       struct zpm_package *pkg;
-
-       if (!zpm) {
-               return -1;
-       }
-
-               pkg = zpm->current_package;
-
-       if (pkg) {
-               ev = getenv("ZPMPACKAGE");
-               if (ev) {
-                       pkg->name = dupstr(ev);
-               }
-               ev = getenv("ZPMPKGREL");
-               if (ev) {
-                       pkg->release = strtol(ev, 0, 0);
-               }
-               ev = getenv("ZPMPKGVER");
-               if (ev) {
-                       pkg->version = dupstr(ev);
-               }
-       }
-
-       /* now, parse the options, return optind so the caller can adjust if needed */
-
-       return av ? ac : 1;
-}
-
 int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
        int rc;
 

diff --git a/zpm-addfile.c b/zpm-addfile.c
index fd8d67b4c50231331d6e721f301fa26b5216e6ca..99f914ca3d2c6226cafc3179292a9fd6a007066b 100644 (file)
--- a/zpm-addfile.c
+++ b/zpm-addfile.c
@@ -12,9 +12,6 @@ int main(int ac, char **av){
                return 1;
        }
 
-       /* this is really just read env */
-       zpm_readopts(&pkg, ac, av);
-
        if (zpm_open(&pkg, av[1])) {
                zpm_begin(&pkg);
                for (i=2; i<ac; i++) {

diff --git a/zpm-findpkg.c b/zpm-findpkg.c
index c3ce4e4ceb80fb217373ca10b7abf32ca94071c9..a376fae07e3a655b02023301c1790956995a29e0 100644 (file)
--- a/zpm-findpkg.c
+++ b/zpm-findpkg.c
@@ -78,9 +78,6 @@ int main(int ac, char **av){
                return 1;
        }
 
-       /* this is really just read env */
-       zpm_readopts(&pkg, ac, av);
-
        /* given a package name, get the packages */
        /* no package name, get all */