Fix a couple of pedantic compiler warnings.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7179 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/cats.h b/bacula/src/cats/cats.h
index e39962430790794c89a1825576a32e2347a1bf28..20e0c2c07cf58c8c15d93d98b67e8136c90f93d4 100644 (file)
--- a/bacula/src/cats/cats.h
+++ b/bacula/src/cats/cats.h
@@ -476,7 +476,7 @@ void               my_postgresql_free_result(B_DB *mdb);
 POSTGRESQL_ROW     my_postgresql_fetch_row  (B_DB *mdb);
 int                my_postgresql_query      (B_DB *mdb, const char *query);
 void               my_postgresql_data_seek  (B_DB *mdb, int row);
-int                my_postgresql_currval    (B_DB *mdb, char *table_name);
+int                my_postgresql_currval    (B_DB *mdb, const char *table_name);
 void               my_postgresql_field_seek (B_DB *mdb, int row);
 POSTGRESQL_FIELD * my_postgresql_fetch_field(B_DB *mdb);
 

diff --git a/bacula/src/cats/postgresql.c b/bacula/src/cats/postgresql.c
index 6c6c38f76b23d54bfe1ae407eb948c51502abe81..82259ff8671fca57290734a975cc80fc37b10b16 100644 (file)
--- a/bacula/src/cats/postgresql.c
+++ b/bacula/src/cats/postgresql.c
@@ -546,7 +546,7 @@ void my_postgresql_free_result(B_DB *mdb)
    db_unlock(mdb);
 }
 
-int my_postgresql_currval(B_DB *mdb, char *table_name)
+int my_postgresql_currval(B_DB *mdb, const char *table_name)
 {
    // Obtain the current value of the sequence that
    // provides the serial value for primary key of the table.
@@ -615,7 +615,7 @@ bail_out:
 
 int my_postgresql_batch_start(JCR *jcr, B_DB *mdb)
 {
-   char *query = "COPY batch FROM STDIN";
+   const char *query = "COPY batch FROM STDIN";
 
    Dmsg0(500, "my_postgresql_batch_start started\n");
 
@@ -709,7 +709,7 @@ int my_postgresql_batch_insert(JCR *jcr, B_DB *mdb, ATTR_DBR *ar)
    int res;
    int count=30;
    size_t len;
-   char *digest;
+   const char *digest;
    char ed1[50];
 
    mdb->esc_name = check_pool_memory_size(mdb->esc_name, mdb->fnl*2+1);

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index c691c2316f31f795c09f0830b5fd803c823a5b28..55b3ea700b492d00de9f67660edde9256c939859 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -732,7 +732,7 @@ get_cmd(FILE *input, const char *prompt, BSOCK *sock, int sec)
 
 #else /* no readline, do it ourselves */
 
-#if !defined(HAVE_WIN32)
+#ifdef HAVE_CONIO
 static bool bisatty(int fd)
 {
    if (no_conio) {

diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 98e36674376ee3c47eb878f3906fa56908c4dfb2..9dbc06f02dfb23bf9a6a96b0e0bcc6f1b89d5977 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -2,6 +2,7 @@
 
 General:
 19Jun08
+kes  Fix a couple of pedantic compiler warnings.
 ebl  Fix bug when starting a restore on a storage that doesn't
      have the requested MediaType.
 18Jun08