From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 14 Apr 2008 16:32:51 +0000 (+0300)
Subject: Avoid unnecessary rpmio_flags alloc+free in psm
X-Git-Tag: tznext/4.11.0.1.tizen20130304~4397
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2bb439b3ca2789f21b1e6efcbe0ffbaad8aca48;p=tools%2Flibrpm-tizen.git

Avoid unnecessary rpmio_flags alloc+free in psm
---

diff --git a/lib/psm.c b/lib/psm.c
index b8f52c1..70f0c2a 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -43,7 +43,7 @@ struct rpmpsm_s {
     FD_t cfd;			/*!< Payload file handle. */
     rpmdbMatchIterator mi;
     const char * stepName;
-    char * rpmio_flags;
+    const char * rpmio_flags;
     char * failedFile;
     int scriptTag;		/*!< Scriptlet data tag. */
     int progTag;		/*!< Scriptlet interpreter tag. */
@@ -1632,7 +1632,6 @@ assert(psm->mi == NULL);
 	    if (fi->h != NULL)
 		fi->h = headerFree(fi->h);
  	}
-	psm->rpmio_flags = _free(psm->rpmio_flags);
 	psm->failedFile = _free(psm->failedFile);
 
 	fi->fgroup = hfd(fi->fgroup, RPM_FORCEFREE_TYPE);
@@ -1728,18 +1727,15 @@ assert(psm->mi == NULL);
 
     case PSM_RPMIO_FLAGS:
     {	const char * payload_compressor = NULL;
-	char * t;
 
 	if (!hge(fi->h, RPMTAG_PAYLOADCOMPRESSOR, NULL,
 			    (rpm_data_t *) &payload_compressor, NULL))
 	    payload_compressor = "gzip";
-	psm->rpmio_flags = t = xmalloc(sizeof("w9.gzdio"));
-	*t = '\0';
-	t = stpcpy(t, "r");
 	if (!strcmp(payload_compressor, "gzip"))
-	    t = stpcpy(t, ".gzdio");
+	    psm->rpmio_flags = "r.gzdio";
 	if (!strcmp(payload_compressor, "bzip2"))
-	    t = stpcpy(t, ".bzdio");
+	    psm->rpmio_flags = "r.bzdio";
+
 	rc = RPMRC_OK;
     }	break;