Forráskód Böngészése

Check content of string instead of its pointer address (#1263)

which will always evaluate to 'true'.

Fixes -Wpointer-bool-conversion compiler warnings.

Co-authored-by: Markus Metz <markus.metz.giswork@gmail.com>
nilason 4 éve
szülő
commit
94cca33234

+ 2 - 2
display/d.mon/list.c

@@ -52,7 +52,7 @@ void list_mon(char ***list, int *n)
     while ((dp = readdir(dirp)) != NULL) {
 	int ret;
 
-        if (!dp->d_name || dp->d_name[0] == '.')
+	if (!dp->d_name[0] || dp->d_name[0] == '.')
 	    continue;
 
 	mon_path = get_path(dp->d_name, TRUE);
@@ -145,7 +145,7 @@ void list_files(const char *name, FILE *fd_out)
         G_fatal_error(_("No support files found for monitor <%s>"), name);
 
     while ((dp = readdir(dirp)) != NULL) {
-        if (!dp->d_name || dp->d_name[0] == '.')
+        if (!dp->d_name[0] || dp->d_name[0] == '.')
             continue;
         
         p = strrchr(dp->d_name, '.');

+ 1 - 1
display/d.mon/stop.c

@@ -34,7 +34,7 @@ int stop(const char *name)
     dirp = opendir(mon_path);
 
     while ((dp = readdir(dirp)) != NULL) {
-        if (!dp->d_name || dp->d_name[0] == '.')
+        if (!*dp->d_name || dp->d_name[0] == '.')
             continue;
         sprintf(file_path, "%s/%s", mon_path, dp->d_name);
         if (unlink(file_path) == -1)

+ 1 - 2
imagery/i.landsat.toar/landsat_set.c

@@ -45,8 +45,7 @@ void sensor_TM(lsat_data * lsat)
     double wmax[] = { 0.52, 0.60, 0.69, 0.90, 1.75, 12.50, 2.35 };
     /* 30, 30, 30, 30, 30, 120 original, 60 resamples before Feb 25, 2010 and 30 after, 30 */
 
-    if (!lsat->sensor)
-	strcpy(lsat->sensor, "TM");
+    strcpy(lsat->sensor, "TM");
 
     lsat->bands = 7;
     for (i = 0; i < lsat->bands; i++) {

+ 1 - 1
imagery/i.landsat.toar/main.c

@@ -319,7 +319,7 @@ int main(int argc, char *argv[])
 	G_debug(1, "lsat.number = %d, lsat.sensor = [%s]",
 		lsat.number, lsat.sensor);
 
-	if (!lsat.sensor || lsat.number > 8 || lsat.number < 1)
+	if (!lsat.sensor[0] || lsat.number > 8 || lsat.number < 1)
 	    G_fatal_error(_("Failed to identify satellite"));
 
 	G_debug(1, "Landsat-%d %s with data set in metadata file [%s]",

+ 2 - 2
include/iostream/ami_stream.h

@@ -613,7 +613,7 @@ AMI_err AMI_STREAM<T>::write_item(const T &elt) {
   } else {
     if (fwrite((char*)(&elt), sizeof(T), 1,fp) < 1) {
       cerr << "ERROR: AMI_STREAM::write_item failed.\n";
-      if (path && *path)
+      if (*path)
 	perror(path);
       else
 	perror("AMI_STREAM::write_item: ");
@@ -640,7 +640,7 @@ AMI_err AMI_STREAM<T>::write_array(const T *data, off_t len) {
     nobj = fwrite(data, sizeof(T), len, fp);
     if (nobj  < len) {
       cerr << "ERROR: AMI_STREAM::write_array failed.\n";
-      if (path && *path)
+      if (*path)
 	perror(path);
       else
 	perror("AMI_STREAM::write_array: ");

+ 1 - 1
lib/db/dbmi_base/dbmscap.c

@@ -210,7 +210,7 @@ dbDbmscap *db_read_dbmscap(void)
 }
 
 static int cmp_entry(dbDbmscap *a, dbDbmscap *b) {
-  return( a->driverName && b->driverName ? strcmp(a->driverName,b->driverName) : 0 );
+    return( *a->driverName && *b->driverName ? strcmp(a->driverName,b->driverName) : 0 );
 }
 
 static void add_entry(dbDbmscap ** list, char *name, char *startup, char *comment)