summaryrefslogtreecommitdiff
path: root/generic
diff options
context:
space:
mode:
Diffstat (limited to 'generic')
-rwxr-xr-xgeneric/Makefile2
-rw-r--r--generic/generic.cpp6
2 files changed, 5 insertions, 3 deletions
diff --git a/generic/Makefile b/generic/Makefile
index 8bc6a49..99a9631 100755
--- a/generic/Makefile
+++ b/generic/Makefile
@@ -3,7 +3,7 @@
CPPFLAGS=-Wall -g -O3 -mcpu=i686 -pedantic -pedantic-errors -I../includes -DPARANOID_SEEK -DHAVE_ZLIB
CXX=g++
-OBJECTS = Buffer.o Exceptions.o Handle.o Image.o Input.o Output.o generic.o fileutils.o String.o
+OBJECTS = Buffer.o Exceptions.o Handle.o Image.o Input.o Output.o generic.o String.o
TARGET = generic.a
all: ${TARGET}
diff --git a/generic/generic.cpp b/generic/generic.cpp
index d165d27..bade101 100644
--- a/generic/generic.cpp
+++ b/generic/generic.cpp
@@ -20,11 +20,13 @@
#include <stdio.h>
#include <stdarg.h>
+#include "String.h"
+
char verbosity = 0;
char * heads[] = {"EE", "--", "WW", "II"};
-void printm(int level, char * m, ...) {
+void printm(int level, String m, ...) {
va_list ap;
if (verbosity < level) {
@@ -36,7 +38,7 @@ void printm(int level, char * m, ...) {
}
va_start(ap, m);
- vfprintf(stderr, m, ap);
+ vfprintf(stderr, m.to_charp(), ap);
va_end(ap);
}