Fix unsigned/int warnings in MySQL + Correct Version table name in update...

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@984 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index c71f92c27f27659a74fdca0f50b17feb2565a1e0..8df73cc7682e26732c26f2b3c3b5cde85b1d2315 100644 (file)
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -363,7 +363,7 @@ list_dashes(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx)
    send(ctx, "+");
    for (i = 0; i < sql_num_fields(mdb); i++) {
       field = sql_fetch_field(mdb);
-      for (j = 0; j < field->max_length + 2; j++) {
+      for (j = 0; j < (int)field->max_length + 2; j++) {
          send(ctx, "-");
       }
       send(ctx, "+");
@@ -401,10 +401,10 @@ list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type)
            max_len = col_len;
         }
       } else {
-        if (IS_NUM(field->type) && field->max_length > 0) { /* fixup for commas */
+        if (IS_NUM(field->type) && (int)field->max_length > 0) { /* fixup for commas */
            field->max_length += (field->max_length - 1) / 3;
         }
-        if (col_len < field->max_length) {
+        if (col_len < (int)field->max_length) {
            col_len = field->max_length;
         }
         if (col_len < 4 && !IS_NOT_NULL(field->flags)) {
@@ -426,7 +426,7 @@ list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type)
    for (i = 0; i < sql_num_fields(mdb); i++) {
       Dmsg1(50, "list_result looking at field %d\n", i);
       field = sql_fetch_field(mdb);
-      bsnprintf(buf, sizeof(buf), " %-*s |", field->max_length, field->name);
+      bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, field->name);
       send(ctx, buf);
    }
    send(ctx, "\n");
@@ -439,12 +439,12 @@ list_result(B_DB *mdb, DB_LIST_HANDLER *send, void *ctx, e_list_type type)
       for (i = 0; i < sql_num_fields(mdb); i++) {
         field = sql_fetch_field(mdb);
         if (row[i] == NULL) {
-            bsnprintf(buf, sizeof(buf), " %-*s |", field->max_length, "NULL");
+            bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, "NULL");
         } else if (IS_NUM(field->type)) {
-            bsnprintf(buf, sizeof(buf), " %*s |", field->max_length,       
+            bsnprintf(buf, sizeof(buf), " %*s |", (int)field->max_length,       
                      add_commas(row[i], ewc));
         } else {
-            bsnprintf(buf, sizeof(buf), " %-*s |", field->max_length, row[i]);
+            bsnprintf(buf, sizeof(buf), " %-*s |", (int)field->max_length, row[i]);
         }
         send(ctx, buf);
       }

diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index 217416ec648c5f66d6d5dd0c5f85efd7e0a0d7ce..c87955612abc36f463f0396c69c32105e7e8f281 100755 (executable)
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -53,7 +53,7 @@ CREATE TABLE BaseFiles (
    );
 
 DELETE FROM Version;
-INSERT INTO VERSION (VersionId) VALUES (7);
+INSERT INTO Version (VersionId) VALUES (7);
 
 END-OF-DATA
 then

diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in
index 548faf7b7d1d876b60ca6e10d8bc4ee13b1df220..d44e26e937d5e2380cbd6f821fc6c3b305e21ce0 100755 (executable)
--- a/bacula/src/cats/update_postgresql_tables.in
+++ b/bacula/src/cats/update_postgresql_tables.in
@@ -12,7 +12,7 @@ if $bindir/psql $* -f - <<END-OF-DATA
 \c bacula
 
 DELETE FROM Version;
-INSERT INTO VERSION (VersionId) VALUES (7);
+INSERT INTO Version (VersionId) VALUES (7);
 
 END-OF-DATA
 then

diff --git a/bacula/src/cats/update_sqlite_tables.in b/bacula/src/cats/update_sqlite_tables.in
index 6f6bab713fb33daa87e9c27cc2a05e6bf20c569e..3c81697d89de68e0950dbc110f08e6bc43473f56 100755 (executable)
--- a/bacula/src/cats/update_sqlite_tables.in
+++ b/bacula/src/cats/update_sqlite_tables.in
@@ -209,6 +209,6 @@ CREATE TABLE BaseFiles (
 COMMIT;
 
 DELETE FROM Version;
-INSERT INTO VERSION (VersionId) VALUES (7);
+INSERT INTO Version (VersionId) VALUES (7);
 
 END-OF-DATA