From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 17 Apr 2012 13:15:33 +0000 (+0300)
Subject: Inline what little is left of fsmCreate() into fsmSetup()
X-Git-Tag: tznext/4.11.0.1.tizen20130304~551
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4cb9109d316e61b5c456efe028b76aab55b5a21d;p=tools%2Flibrpm-tizen.git

Inline what little is left of fsmCreate() into fsmSetup()

- Besides being a bizarre name for "some extra initialization" work,
  fsmCreate() was full of redundant goo, including a rather complex
  way of mapping a zero return back to zero in case it really was
  zero .. or something.
---

diff --git a/lib/fsm.c b/lib/fsm.c
index 2dcbf41..54dd87a 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -599,33 +599,14 @@ static hardLink_t freeHardLink(hardLink_t li)
 /* forward declaration*/
 static int fsmMkdirs(DNLI_t dnli, struct selabel_handle *sehandle);
 
-static int fsmCreate(FSM_t fsm)
-{
-    int rc = 0;
-    fsm->path = _free(fsm->path);
-
-    fsm->buf = _free(fsm->buf);
-    fsm->bufsize = 0;
-    if (fsm->goal == FSM_PKGINSTALL || fsm->goal == FSM_PKGBUILD) {
-        fsm->bufsize = 8 * BUFSIZ;
-        fsm->buf = xmalloc(fsm->bufsize);
-    }
-
-    fsm->ix = -1;
-    fsm->links = NULL;
-    fsm->li = NULL;
-    errno = 0;	/* XXX get rid of EBADF */
-
-    return rc;
-}
-
 static int fsmSetup(FSM_t fsm, fileStage goal,
 		rpmts ts, rpmte te, rpmfi fi, FD_t cfd, rpmpsm psm,
 		rpm_loff_t * archiveSize, char ** failedFile)
 {
-    int rc, ec = 0;
+    int rc = 0;
     int isSrc = rpmteIsSource(te);
 
+    fsm->ix = -1;
     fsm->goal = goal;
     if (cfd != NULL) {
 	fsm->cfd = fdLink(cfd);
@@ -647,6 +628,11 @@ static int fsmSetup(FSM_t fsm, fileStage goal,
         fsm->archive = rpmcpioOpen(cfd, O_RDONLY);
     }
 
+    if (fsm->goal == FSM_PKGINSTALL || fsm->goal == FSM_PKGBUILD) {
+        fsm->bufsize = 8 * BUFSIZ;
+        fsm->buf = xmalloc(fsm->bufsize);
+    }
+
     fsm->archiveSize = archiveSize;
     if (fsm->archiveSize)
 	*fsm->archiveSize = 0;
@@ -654,12 +640,10 @@ static int fsmSetup(FSM_t fsm, fileStage goal,
     if (fsm->failedFile)
 	*fsm->failedFile = NULL;
 
-    ec = fsm->rc = 0;
-    rc = fsmCreate(fsm);
-    if (rc && !ec) ec = rc;
+    if (cfd != NULL && fsm->archive == NULL)
+	rc = 1;
 
-/* FIX: *fsm->failedFile may be NULL */
-   return ec;
+    return rc;
 }
 
 static int fsmTeardown(FSM_t fsm)