From b3edbd561c1b57f7caf87a7454704829f9f6d374 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 22 Feb 2010 21:48:23 +0100 Subject: [PATCH] Fix compiler warnings in tools directory --- bacula/src/tools/Makefile.in | 4 ++-- bacula/src/tools/gigaslam.c | 2 +- bacula/src/tools/ing_test.c | 12 ++++++------ bacula/src/tools/testls.c | 3 +-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in index f98845f989..8ee0a20bc8 100644 --- a/bacula/src/tools/Makefile.in +++ b/bacula/src/tools/Makefile.in @@ -112,10 +112,10 @@ ing_test: Makefile ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(D -lbacsql -lbacfind -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) gigaslam.o: gigaslam.c - $(CC) $(CFLAGS) -c $< + $(CXX) $(CFLAGS) -c $< gigaslam: gigaslam.o - $(CC) -o $@ gigaslam.o + $(CXX) -o $@ gigaslam.o grow: Makefile grow.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -o $@ grow.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) diff --git a/bacula/src/tools/gigaslam.c b/bacula/src/tools/gigaslam.c index 42dc6f9112..0162f19a0d 100644 --- a/bacula/src/tools/gigaslam.c +++ b/bacula/src/tools/gigaslam.c @@ -34,7 +34,7 @@ #include #include -int main(void) +int main(int argc, char *const *argv) { FILE *fp = fopen("gigaslam.gif", "w"); char header[] = "\n\n
\n"; diff --git a/bacula/src/tools/ing_test.c b/bacula/src/tools/ing_test.c index 3576087dcf..6d49b4bbe3 100644 --- a/bacula/src/tools/ing_test.c +++ b/bacula/src/tools/ing_test.c @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2009-2009 Free Software Foundation Europe e.V. + Copyright (C) 2009-2010 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -44,7 +44,7 @@ /* Local variables */ static B_DB *db; static const char *file = "COPYRIGHT"; -static DBId_t fnid=0; +//static DBId_t fnid=0; static const char *db_name = "bacula"; static const char *db_user = "bacula"; static const char *db_password = ""; @@ -249,10 +249,10 @@ int main (int argc, char *argv[]) Dmsg0(200, "DB-Statement: CREATE TABLE for datatypes\n"); if (!db_sql_query(db, "CREATE TABLE t2 (" - "c1 integer," - "c2 varchar(255)," - "c3 char(255)" - /* some more datatypes... "c4 ," */ + "c1 integer," + "c2 varchar(255)," + "c3 char(255)" + /* some more datatypes... "c4 ," */ ")" , NULL, NULL)) { Emsg0(M_ERROR_TERM, 0, _("CREATE-Stmt went wrong\n")); diff --git a/bacula/src/tools/testls.c b/bacula/src/tools/testls.c index f99d69e06b..6fd6e63753 100644 --- a/bacula/src/tools/testls.c +++ b/bacula/src/tools/testls.c @@ -77,8 +77,7 @@ static void usage() } -int -main (int argc, char *const *argv) +int main(int argc, char *const *argv) { FF_PKT *ff; char name[1000]; -- 2.39.5