Merge remote-tracking branch 'stefanha/trivial-patches' into staging

cmd.c

@@ -45,11 +45,9 @@ compare(const void *a, const void *b)
 		      ((const cmdinfo_t *)b)->name);
 }
 
-void
+void add_command(const cmdinfo_t *ci)
-add_command(
-	const cmdinfo_t	*ci)
 {
-	cmdtab = realloc((void *)cmdtab, ++ncmds * sizeof(*cmdtab));
+    cmdtab = g_realloc((void *)cmdtab, ++ncmds * sizeof(*cmdtab));
     cmdtab[ncmds - 1] = *ci;
     qsort(cmdtab, ncmds, sizeof(*cmdtab), compare);
 }
@@ -122,15 +120,9 @@ find_command(
 	return NULL;
 }
 
-void
+void add_user_command(char *optarg)
-add_user_command(char *optarg)
 {
-	ncmdline++;
+    cmdline = g_realloc(cmdline, ++ncmdline * sizeof(char *));
-	cmdline = realloc(cmdline, sizeof(char*) * (ncmdline));
-	if (!cmdline) {
-		perror("realloc");
-		exit(1);
-	}
     cmdline[ncmdline-1] = optarg;
 }
 
@@ -160,8 +152,7 @@ static void prep_fetchline(void *opaque)
 
 static char *get_prompt(void);
 
-void
+void command_loop(void)
-command_loop(void)
 {
     int c, i, j = 0, done = 0, fetchable = 0, prompted = 0;
     char *input;
@@ -171,8 +162,7 @@ command_loop(void)
     for (i = 0; !done && i < ncmdline; i++) {
         input = strdup(cmdline[i]);
         if (!input) {
-			fprintf(stderr,
+            fprintf(stderr, _("cannot strdup command '%s': %s\n"),
-				_("cannot strdup command '%s': %s\n"),
                     cmdline[i], strerror(errno));
             exit(1);
         }
@@ -180,21 +170,22 @@ command_loop(void)
         if (c) {
             ct = find_command(v[0]);
             if (ct) {
-				if (ct->flags & CMD_FLAG_GLOBAL)
+                if (ct->flags & CMD_FLAG_GLOBAL) {
                     done = command(ct, c, v);
-				else {
+                } else {
                     j = 0;
-					while (!done && (j = args_command(j)))
+                    while (!done && (j = args_command(j))) {
                         done = command(ct, c, v);
                     }
-			} else
+                }
-				fprintf(stderr, _("command \"%s\" not found\n"),
+            } else {
-					v[0]);
+                fprintf(stderr, _("command \"%s\" not found\n"), v[0]);
+            }
 	}
         doneline(input, v);
     }
     if (cmdline) {
-		free(cmdline);
+        g_free(cmdline);
         return;
     }
 
@@ -212,16 +203,18 @@ command_loop(void)
         if (!fetchable) {
             continue;
         }
-		if ((input = fetchline()) == NULL)
+        input = fetchline();
+        if (input == NULL) {
             break;
+        }
         v = breakline(input, &c);
         if (c) {
             ct = find_command(v[0]);
-			if (ct)
+            if (ct) {
                 done = command(ct, c, v);
-			else
+            } else {
-				fprintf(stderr, _("command \"%s\" not found\n"),
+                fprintf(stderr, _("command \"%s\" not found\n"), v[0]);
-					v[0]);
+            }
         }
         doneline(input, v);
 
@@ -331,23 +324,26 @@ static char *qemu_strsep(char **input, const char *delim)
     return result;
 }
 
-char **
+char **breakline(char *input, int *count)
-breakline(
-	char	*input,
-	int	*count)
 {
     int c = 0;
     char *p;
     char **rval = calloc(sizeof(char *), 1);
+    char **tmp;
 
     while (rval && (p = qemu_strsep(&input, " ")) != NULL) {
-		if (!*p)
+        if (!*p) {
             continue;
+        }
         c++;
-		rval = realloc(rval, sizeof(*rval) * (c + 1));
+        tmp = realloc(rval, sizeof(*rval) * (c + 1));
-		if (!rval) {
+        if (!tmp) {
+            free(rval);
+            rval = NULL;
             c = 0;
             break;
+        } else {
+            rval = tmp;
         }
         rval[c - 1] = p;
         rval[c] = NULL;

hw/xen_platform.c

@@ -113,7 +113,7 @@ static void platform_fixed_ioport_writew(void *opaque, uint32_t addr, uint32_t v
 {
     PCIXenPlatformState *s = opaque;
 
-    switch (addr - XEN_PLATFORM_IOPORT) {
+    switch (addr) {
     case 0:
         /* Unplug devices.  Value is a bitmask of which devices to
            unplug, with bit 0 the IDE devices, bit 1 the network
@@ -152,7 +152,7 @@ static void platform_fixed_ioport_writew(void *opaque, uint32_t addr, uint32_t v
 static void platform_fixed_ioport_writel(void *opaque, uint32_t addr,
                                          uint32_t val)
 {
-    switch (addr - XEN_PLATFORM_IOPORT) {
+    switch (addr) {
     case 0:
         /* PV driver version */
         break;
@@ -163,7 +163,7 @@ static void platform_fixed_ioport_writeb(void *opaque, uint32_t addr, uint32_t v
 {
     PCIXenPlatformState *s = opaque;
 
-    switch (addr - XEN_PLATFORM_IOPORT) {
+    switch (addr) {
     case 0: /* Platform flags */ {
         hvmmem_type_t mem_type = (val & PFFLAG_ROM_LOCK) ?
             HVMMEM_ram_ro : HVMMEM_ram_rw;
@@ -186,7 +186,7 @@ static uint32_t platform_fixed_ioport_readw(void *opaque, uint32_t addr)
 {
     PCIXenPlatformState *s = opaque;
 
-    switch (addr - XEN_PLATFORM_IOPORT) {
+    switch (addr) {
     case 0:
         if (s->drivers_blacklisted) {
             /* The drivers will recognise this magic number and refuse
@@ -205,7 +205,7 @@ static uint32_t platform_fixed_ioport_readb(void *opaque, uint32_t addr)
 {
     PCIXenPlatformState *s = opaque;
 
-    switch (addr - XEN_PLATFORM_IOPORT) {
+    switch (addr) {
     case 0:
         /* Platform flags */
         return s->flags;
@@ -221,7 +221,7 @@ static void platform_fixed_ioport_reset(void *opaque)
 {
     PCIXenPlatformState *s = opaque;
 
-    platform_fixed_ioport_writeb(s, XEN_PLATFORM_IOPORT, 0);
+    platform_fixed_ioport_writeb(s, 0, 0);
 }
 
 const MemoryRegionPortio xen_platform_ioport[] = {
@@ -251,7 +251,7 @@ static void platform_fixed_ioport_init(PCIXenPlatformState* s)
 static uint32_t xen_platform_ioport_readb(void *opaque, uint32_t addr)
 {
     if (addr == 0) {
-        return platform_fixed_ioport_readb(opaque, XEN_PLATFORM_IOPORT);
+        return platform_fixed_ioport_readb(opaque, 0);
     } else {
         return ~0u;
     }
@@ -263,7 +263,7 @@ static void xen_platform_ioport_writeb(void *opaque, uint32_t addr, uint32_t val
 
     switch (addr) {
     case 0: /* Platform flags */
-        platform_fixed_ioport_writeb(opaque, XEN_PLATFORM_IOPORT, val);
+        platform_fixed_ioport_writeb(opaque, 0, val);
         break;
     case 8:
         log_writeb(s, val);
@@ -321,7 +321,7 @@ static int xen_platform_post_load(void *opaque, int version_id)
 {
     PCIXenPlatformState *s = opaque;
 
-    platform_fixed_ioport_writeb(s, XEN_PLATFORM_IOPORT, s->flags);
+    platform_fixed_ioport_writeb(s, 0, s->flags);
 
     return 0;
 }

readline.c

@@ -236,7 +236,7 @@ static void readline_hist_add(ReadLineState *rs, const char *cmdline)
 	    new_entry = hist_entry;
 	    /* Put this entry at the end of history */
 	    memmove(&rs->history[idx], &rs->history[idx + 1],
-		    (READLINE_MAX_CMDS - idx + 1) * sizeof(char *));
+		    (READLINE_MAX_CMDS - (idx + 1)) * sizeof(char *));
 	    rs->history[READLINE_MAX_CMDS - 1] = NULL;
 	    for (; idx < READLINE_MAX_CMDS; idx++) {
 		if (rs->history[idx] == NULL)