Actually load and check for debug format, instead of trying to load it as an

object format (typos).

svn path=/trunk/yasm/; revision=785

diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index caf726eb14f5731e9cb22f9767c872b1766859de..dc240b6867db22ec18b93f09790de1d2312e2f04 100644 (file)
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -289,7 +289,7 @@ main(int argc, char *argv[])
 
     /* If not already specified, default to null as the debug format. */
     if (!cur_dbgfmt)
-       cur_dbgfmt = load_objfmt("null");
+       cur_dbgfmt = load_dbgfmt("null");
     else {
        int matched_dbgfmt = 0;
        /* Check to see if the requested debug format is in the allowed list
@@ -309,8 +309,8 @@ main(int argc, char *argv[])
        }
     }
 
-    if (!cur_objfmt) {
-       ErrorNow(_("Could not load default object format"));
+    if (!cur_dbgfmt) {
+       ErrorNow(_("Could not load default debug format"));
        return EXIT_FAILURE;
     }
 

diff --git a/src/main.c b/src/main.c
index caf726eb14f5731e9cb22f9767c872b1766859de..dc240b6867db22ec18b93f09790de1d2312e2f04 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -289,7 +289,7 @@ main(int argc, char *argv[])
 
     /* If not already specified, default to null as the debug format. */
     if (!cur_dbgfmt)
-       cur_dbgfmt = load_objfmt("null");
+       cur_dbgfmt = load_dbgfmt("null");
     else {
        int matched_dbgfmt = 0;
        /* Check to see if the requested debug format is in the allowed list
@@ -309,8 +309,8 @@ main(int argc, char *argv[])
        }
     }
 
-    if (!cur_objfmt) {
-       ErrorNow(_("Could not load default object format"));
+    if (!cur_dbgfmt) {
+       ErrorNow(_("Could not load default debug format"));
        return EXIT_FAILURE;
     }