]> git.sur5r.net Git - bacula/bacula/commitdiff
projects / bacula / bacula / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 70251ac)
Fix compiler warnings in tools directory
authorKern Sibbald <kern@sibbald.com>
Mon, 22 Feb 2010 20:48:23 +0000 (21:48 +0100)
committerKern Sibbald <kern@sibbald.com>
Tue, 23 Feb 2010 11:08:42 +0000 (12:08 +0100)
bacula/src/tools/Makefile.in patch | blob | history
bacula/src/tools/gigaslam.c patch | blob | history
bacula/src/tools/ing_test.c patch | blob | history
bacula/src/tools/testls.c patch | blob | history

diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
index f98845f98917c84b431fbd8abd2a4f85af78da9f..8ee0a20bc8c758ed24a5d9c222ce243687fe5604 100644 (file)
--- 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 42dc6f9112aabf5b53e8ce71885001d2ad16a7d5..0162f19a0df04ec78daec65cad2ab5c9d8ae73b8 100644 (file)
--- a/bacula/src/tools/gigaslam.c
+++ b/bacula/src/tools/gigaslam.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <string.h>
 
-int main(void)
+int main(int argc, char *const *argv)
 {
     FILE *fp = fopen("gigaslam.gif", "w");
     char header[] = "<html>\n<table>\n<tr><td>\n";
diff --git a/bacula/src/tools/ing_test.c b/bacula/src/tools/ing_test.c
index 3576087dcf24a8c7674d19214583e165a562f2cf..6d49b4bbe33090db394d1eabfa6f2f75671abffa 100644 (file)
--- 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 f99d69e06b997689b7b2ad627dabb4b6163adbf1..6fd6e637531bd57c47e2d6c24c9dd829f547d13f 100644 (file)
--- 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];
Cloned from http://git.bacula.org/bacula