Queryformat string sanity in queryArgCallback()

- Use our string helper functions instead of manual length calculations
  and allocations

lib/poptQV.c

@@ -143,12 +143,9 @@ static void queryArgCallback(poptContext con,
 	if (arg) {
 	    char * qf = (char *)qva->qva_queryFormat;
 	    if (qf) {
-		size_t len = strlen(qf) + strlen(arg) + 1;
+		rstrcat(&qf, arg);
-		qf = xrealloc(qf, len);
-		strcat(qf, arg);
 	    } else {
-		qf = xmalloc(strlen(arg) + 1);
+		qf = xstrdup(arg);
-		strcpy(qf, arg);
 	    }
 	    qva->qva_queryFormat = qf;
 	}