Merge branch 'master' into cmd-casl

[YACASL2.git] / src / assemble.c

diff --git a/src/assemble.c b/src/assemble.c
index 2b2bb5d..7966ea9 100644 (file)
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -395,10 +395,6 @@ bool assembleline(const CMDLINE *cmdl, PASS pass)
     return status;
 }
 
-void printline(FILE *stream, const char *filename, int lineno, char *line) {
-    fprintf(stream, "%s:%5d:%s", filename, lineno, line);
-}
-
 /* 指定された名前のファイルをアセンブル */
 /* 2回実行される */
 bool assemble(const char *file, PASS pass)
@@ -426,7 +422,7 @@ bool assemble(const char *file, PASS pass)
         if((pass == FIRST && (&asmode)->src == true) ||
            (pass == SECOND && (&asmode)->asdetail == true))
         {
-            printline(stdout, file, lineno, line);
+            fprintf(stdout, "%s:%5d:%s", file, lineno, line);
         }
         if((cmdl = linetok(line)) != NULL) {
             if(pass == FIRST && cmdl->label != NULL) {
@@ -443,8 +439,7 @@ bool assemble(const char *file, PASS pass)
         }
     }
     if(cerrno > 0) {
-        fprintf(stderr, "Assemble error - %d: %s\n", cerrno, cerrmsg);
-        printline(stderr, file, lineno, line);
+        fprintf(stderr, "Assemble error - %d: %s\n %s:%d: %s\n", cerrno, cerrmsg, file, lineno, line);
         status = false;
     }
     fclose(fp);