Changeset 1523 for trunk/layout.c

Timestamp:

Apr 15, 2012 4:09:16 PM (13 months ago)

Author:

stefanct

Message:

Check for duplicate -i arguments.

And a tiny cleanup.

Signed-off-by: Stefan Tauner <stefan.tauner@…>
Acked-by: Uwe Hermann <uwe@…>

File:

• trunk/layout.c (modified) (3 diffs)

trunk/layout.c

@@ -202 +202 @@
 #endif
 
+/* returns the index of the entry (or a negative value if it is not found) */
+int find_include_arg(const char *const name)
+{
+        unsigned int i;
+        for (i = 0; i < num_include_args; i++) {
+                if (!strcmp(include_args[i], name))
+                        return i;
+        }
+        return -1;
+}
+
 /* register an include argument (-i) for later processing */
 int register_include_arg(char *name)
@@ -212 +223 @@
         if (name == NULL) {
                 msg_gerr("<NULL> is a bad region name.\n");
+                return 1;
+        }
+
+        if (find_include_arg(name) != -1) {
+                msg_gerr("Duplicate region name: \"%s\".\n", name);
                 return 1;
         }
@@ -251 +267 @@
                 return 0;
 
+        /* User has specified an area, but no layout file is loaded. */
+        if (!romimages) {
+                msg_gerr("Region requested (with -i \"%s\"), "
+                         "but no layout data is available.\n",
+                         include_args[0]);
+                return 1;
+        }
+
         for (i = 0; i < num_include_args; i++) {
-                /* User has specified an area, but no layout file is loaded. */
-                if (!romimages) {
-                        msg_gerr("Region requested (with -i \"%s\"), "
-                                 "but no layout data is available.\n",
-                                 include_args[i]);
-                        return 1;
-                }
-
                 if (find_romentry(include_args[i]) < 0) {
-                        msg_gerr("Invalid region specified: \"%s\"\n",
+                        msg_gerr("Invalid region specified: \"%s\".\n",
                                  include_args[i]);
                         return 1;