Fix some compiler warnings.

bareos · Oct 7, 2014 · cca28c9 · cca28c9
1 parent d9f75b9
commit cca28c9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/src/dird/dird_conf.c b/src/dird/dird_conf.c
@@ -931,7 +931,7 @@ static inline void print_config_run(RES_ITEM *item, POOL_MEM &cfg_str)
 
          POOL_MEM t; /* is one entry of day/month/week etc. */
 
-         pm_strcpy(temp, '\0');
+         pm_strcpy(temp, "");
          for (int i = 0; i < 32; i++) {  /* search for one more than needed to detect also intervals that stop on last value  */
             if (bit_is_set(i, run->mday)) {
                if (interval_start == -1) {   // bit is set and we are not in an interval
@@ -973,7 +973,7 @@ static inline void print_config_run(RES_ITEM *item, POOL_MEM &cfg_str)
          interval_start = -1;
 
          all_set =  true;
-         pm_strcpy(temp, '\0');
+         pm_strcpy(temp, "");
          for (int i = 0; i < 5; i++) {
             if (bit_is_set(i, run->wom)) {
                if (interval_start == -1) {   // bit is set and we are not in an interval
@@ -1013,7 +1013,7 @@ static inline void print_config_run(RES_ITEM *item, POOL_MEM &cfg_str)
           * run->wday output is Sun, Mon, ..., Sat comma separated
           */
          all_set =  true;
-         pm_strcpy(temp, '\0');
+         pm_strcpy(temp, "");
          for (int i = 0; i < 7; i++) {
             if (bit_is_set(i, run->wday)) {
                if (interval_start == -1) {   // bit is set and we are not in an interval
@@ -1051,7 +1051,7 @@ static inline void print_config_run(RES_ITEM *item, POOL_MEM &cfg_str)
           * run->woy output is w00 - w53, comma separated
           */
          all_set = true;
-         pm_strcpy(temp, '\0');
+         pm_strcpy(temp, "");
          for (int i = 0; i < 55; i++) {
             if (bit_is_set(i, run->woy)) {
                if (interval_start == -1) {   // bit is set and we are not in an interval
@@ -1089,7 +1089,7 @@ static inline void print_config_run(RES_ITEM *item, POOL_MEM &cfg_str)
           * only "hourly" sets all bits.
           */
          all_set = true;
-         pm_strcpy(temp, '\0');
+         pm_strcpy(temp, "");
          for (int i = 0; i < 24; i++) {
             if bit_is_set(i, run->hour) {
                Mmsg(temp, "at %02d:%02d\n", i, run->minute);
@@ -3151,10 +3151,10 @@ extern "C" char *job_code_callback_director(JCR *jcr, const char *param)
          if (jcr->VolumeName) {
             return jcr->VolumeName;
          } else {
-            return _("*none*");
+            return (char *)_("*none*");
          }
       } else {
-         return _("*none*");
+         return (char *)_("*none*");
       }
       break;
    }

diff --git a/src/dird/ndmp_dma.c b/src/dird/ndmp_dma.c
@@ -1807,9 +1807,7 @@ static inline int native_to_ndmp_loglevel(CLIENTRES *client, int debuglevel, NIS
    /*
     * Make sure the level is in the wanted range.
     */
-   if (level < 0) {
-      level = 0;
-   } else if (level > 9) {
+   if (level > 9) {
       level = 9;
    }
 

diff --git a/src/ndmp/Makefile.in b/src/ndmp/Makefile.in
@@ -169,7 +169,7 @@ ndmp9.h ndmp9_xdr.c: ndmp9.x
 
 ndmos.lo: ndmos.c
 	@echo "Compiling $<"
-	$(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(INCLUDES) $(DINCLUDE) $(CXXFLAGS) \
+	$(NO_ECHO)$(LIBTOOL_COMPILE) $(CC) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(INCLUDES) $(DINCLUDE) $(CXXFLAGS) \
 		-DNDMOS_CONST_PRODUCT_NAME='"BAREOS NDMP"' \
 		-DNDMOS_CONST_VENDOR_NAME='"Bareos GmbH & Co. KG"' \
 		-DNDMOS_CONST_NDMJOBLIB_REVISION='"bareos-$(LIBBAREOSNDMP_LT_RELEASE)"' \

diff --git a/src/plugins/filed/python-fd.c b/src/plugins/filed/python-fd.c
@@ -2722,7 +2722,7 @@ static int PyIoPacket_init(PyIoPacket *self, PyObject *args, PyObject *kwds)
    self->status = 0;
    self->io_errno = 0;
    self->lerror = 0;
-   self->whence - 0;
+   self->whence = 0;
    self->offset = 0;
    self->win32 = false;
 

diff --git a/src/stored/ndmp_tape.c b/src/stored/ndmp_tape.c
@@ -161,9 +161,7 @@ static inline int native_to_ndmp_loglevel(int debuglevel, NIS *nis)
    /*
     * Make sure the level is in the wanted range.
     */
-   if (level < 0) {
-      level = 0;
-   } else if (level > 9) {
+   if (level > 9) {
       level = 9;
    }
 
@@ -273,7 +271,7 @@ extern "C" int bndmp_auth_clear(struct ndm_session *sess, char *name, char *pass
 
             nis = (NIS *)sess->param->log.ctx;
             if (nis->LogLevel != auth_config->LogLevel) {
-               if (auth_config->LogLevel >= 0 && auth_config->LogLevel <= 9) {
+               if (auth_config->LogLevel <= 9) {
                   nis->LogLevel = auth_config->LogLevel;
                }
             }
@@ -318,7 +316,7 @@ extern "C" int bndmp_auth_md5(struct ndm_session *sess, char *name, char digest[
 
          nis = (NIS *)sess->param->log.ctx;
          if (nis->LogLevel != auth_config->LogLevel) {
-            if (auth_config->LogLevel >= 0 && auth_config->LogLevel <= 9) {
+            if (auth_config->LogLevel <= 9) {
                nis->LogLevel = auth_config->LogLevel;
             }
          }