6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-01-12 17:30:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Christian Groessler 2013-09-25 22:19:57 +02:00
commit d67d19211c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ar65/library.c
View File

@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998-2012, Ullrich von Bassewitz */ /* (C) 1998-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@ -38,6 +38,7 @@
#include <errno.h> #include <errno.h>
/* common */ /* common */
#include "cmdline.h"
#include "exprdefs.h" #include "exprdefs.h"
#include "libdefs.h" #include "libdefs.h"
#include "print.h" #include "print.h"
@ -229,7 +230,9 @@ void LibOpen (const char* Name, int MustExist, int NeedTemp)
if (MustExist) { if (MustExist) {
Error ("Library `%s' does not exist", Name); Error ("Library `%s' does not exist", Name);
} else { } else {
Warning ("Library `%s' not found - will be created", Name); /* Announce the library's creation if ar65 is verbose. */
Print (stdout, 1,
"%s: Library `%s' will be created.\n", ProgName, Name);
} }
} else { } else {
@ -307,7 +310,7 @@ static void LibCheckExports (ObjData* O)
unsigned I; unsigned I;
/* Let the user know what we do */ /* Let the user know what we do */
Print (stdout, 1, "Module `%s' (%u exports):\n", O->Name, CollCount (&O->Exports)); Print (stdout, 2, "Module `%s' (%u exports):\n", O->Name, CollCount (&O->Exports));
/* Insert the exports into the global table */ /* Insert the exports into the global table */
for (I = 0; I < CollCount (&O->Exports); ++I) { for (I = 0; I < CollCount (&O->Exports); ++I) {
@ -316,7 +319,7 @@ static void LibCheckExports (ObjData* O)
const char* Name = CollConstAt (&O->Exports, I); const char* Name = CollConstAt (&O->Exports, I);
/* Insert the name into the hash table */ /* Insert the name into the hash table */
Print (stdout, 1, " %s\n", Name); Print (stdout, 2, " %s\n", Name);
ExpInsert (Name, O); ExpInsert (Name, O);
} }
} }

7
src/ar65/main.c
View File

@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998-2012, Ullrich von Bassewitz */ /* (C) 1998-2013, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@ -60,11 +60,12 @@
static void Usage (void) static void Usage (void)
/* Print usage information and exit */ /* Print usage information and exit */
{ {
printf ("Usage: %s <operation> lib file|module ...\n" fprintf (stderr, "Usage: %s <operation ...> lib file|module ...\n"
"Operation is one of:\n" "Operations are some of:\n"
"\ta\tAdd modules\n" "\ta\tAdd modules\n"
"\td\tDelete modules\n" "\td\tDelete modules\n"
"\tl\tList library contents\n" "\tl\tList library contents\n"
"\tv\tIncrease verbosity (put before other operation)\n"
"\tx\tExtract modules\n" "\tx\tExtract modules\n"
"\tV\tPrint the archiver version\n", "\tV\tPrint the archiver version\n",
ProgName); ProgName);