- add join_dup helper, cleanup code

[platform/upstream/libsolv.git] / ext / repo_zyppdb.c

diff --git a/ext/repo_zyppdb.c b/ext/repo_zyppdb.c
index 8882fce..e511872 100644 (file)
--- a/ext/repo_zyppdb.c
+++ b/ext/repo_zyppdb.c
@@ -79,6 +79,7 @@ struct parsedata {
 
   struct stateswitch *swtab[NUMSTATES];
   enum state sbtab[NUMSTATES];
+  struct joindata jd;
 
   const char *tmplang;
 
@@ -92,18 +93,17 @@ struct parsedata {
  * find value for xml attribute
  * I: txt, name of attribute
  * I: atts, list of key/value attributes
- * I: dup, strdup it
  * O: pointer to value of matching key, or NULL
  *
  */
 
 static inline const char *
-find_attr(const char *txt, const char **atts, int dup)
+find_attr(const char *txt, const char **atts)
 {
   for (; *atts; atts += 2)
     {
       if (!strcmp(*atts, txt))
-        return dup ? solv_strdup(atts[1]) : atts[1];
+        return atts[1];
     }
   return 0;
 }
@@ -160,7 +160,7 @@ startElement(void *userData, const char *name, const char **atts)
     case STATE_PRODUCT:
       {
        /* parse 'type' */
-       const char *type = find_attr("type", atts, 0);
+       const char *type = find_attr("type", atts);
        s = pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo));
        repodata_extend(pd->data, s - pool->solvables);
        pd->handle = s - pool->solvables;
@@ -170,15 +170,15 @@ startElement(void *userData, const char *name, const char **atts)
       break;
     case STATE_VERSION:
       {
-       const char *ver = find_attr("ver", atts, 0);
-       const char *rel = find_attr("rel", atts, 0);
-       /* const char *epoch = find_attr("epoch", atts, 1); ignored */
-       s->evr = makeevr(pd->pool, join2(ver, "-", rel));
+       const char *ver = find_attr("ver", atts);
+       const char *rel = find_attr("rel", atts);
+       /* const char *epoch = find_attr("epoch", atts); ignored */
+       s->evr = makeevr(pd->pool, join2(&pd->jd, ver, "-", rel));
       }
       break;
       /* <summary lang="xy">... */
     case STATE_SUMMARY:
-      pd->tmplang = find_attr("lang", atts, 1);
+      pd->tmplang = join_dup(&pd->jd, find_attr("lang", atts));
       break;
     default:
       break;
@@ -219,14 +219,13 @@ endElement(void *userData, const char *name)
       pd->solvable = 0;
       break;
     case STATE_NAME:
-      s->name = pool_str2id(pd->pool, join2("product", ":", pd->content), 1);
+      s->name = pool_str2id(pd->pool, join2(&pd->jd, "product", ":", pd->content), 1);
       break;
     case STATE_ARCH:
       s->arch = pool_str2id(pd->pool, pd->content, 1);
       break;
     case STATE_SUMMARY:
       repodata_set_str(pd->data, pd->handle, pool_id2langid(pd->pool, SOLVABLE_SUMMARY, pd->tmplang, 1), pd->content);
-      pd->tmplang = solv_free((void *)pd->tmplang);
       break;
     case STATE_VENDOR:
       s->vendor = pool_str2id(pd->pool, pd->content, 1);
@@ -342,7 +341,7 @@ repo_add_zyppdb_products(Repo *repo, const char *dirpath, int flags)
        {
          if (strlen(entry->d_name) < 3)
            continue;   /* skip '.' and '..' */
-         fullpath = join2(dirpath, "/", entry->d_name);
+         fullpath = join2(&pd.jd, dirpath, "/", entry->d_name);
          if ((fp = fopen(fullpath, "r")) == 0)
            {
              perror(fullpath);
@@ -354,9 +353,8 @@ repo_add_zyppdb_products(Repo *repo, const char *dirpath, int flags)
     }
   closedir(dir);
 
-  solv_free((void *)pd.tmplang);
   free(pd.content);
-  join_freemem();
+  join_freemem(&pd.jd);
   if (!(flags & REPO_NO_INTERNALIZE))
     repodata_internalize(data);
 }