Clean up rpmgiGlobArgv() a bit

- Check for NULL early once to avoid having to deal with it later
- Check for rpmGlob() return code and only append on success
- Count args centrally on exit

1 files changed, 14 insertions, 21 deletions

diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index 19f8f9fdf..afc1c4916 100644
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -150,33 +150,26 @@ static Header rpmgiLoadReadHeader(rpmgi gi)
  */
 static void rpmgiGlobArgv(rpmgi gi, ARGV_const_t argv)
 {
-    const char * arg;
-    int ac = 0;
-    int xx;
+    if (argv == NULL) return;
 
     /* XXX Expand globs only if requested */
     if ((gi->flags & RPMGI_NOGLOB)) {
-	if (argv != NULL) {
-	    while (argv[ac] != NULL)
-		ac++;
-	    xx = argvAppend(&gi->argv, argv);
+	argvAppend(&gi->argv, argv);
+    } else {
+	const char * arg;
+	while ((arg = *argv++) != NULL) {
+	    char * t = rpmEscapeSpaces(arg);
+	    char ** av = NULL;
+
+	    if (rpmGlob(t, NULL, &av) == 0) {
+		argvAppend(&gi->argv, av);
+		argvFree(av);
+	    }
+	    free(t);
 	}
-	gi->argc = ac;
-	return;
     }
+    gi->argc = argvCount(gi->argv);
 
-    if (argv != NULL)
-    while ((arg = *argv++) != NULL) {
-	char * t = rpmEscapeSpaces(arg);
-	char ** av = NULL;
-
-	xx = rpmGlob(t, &ac, &av);
-	xx = argvAppend(&gi->argv, av);
-	gi->argc += ac;
-	av = argvFree(av);
-	t = _free(t);
-	ac = 0;
-    }
     return;
 }