Changeset 62325

Timestamp:

Oct 21, 2014, 10:45:15 AM (10 years ago)

Author:

martinl

Message:

v.in.ogr: fix driver_name usage (can be NULL)

File:

• grass/trunk/vector/v.in.ogr/main.c (modified) (3 diffs)

grass/trunk/vector/v.in.ogr/main.c

@@ -345 +345 @@
     driver_name = db_get_default_driver_name();
 
-    if (strcmp(driver_name, "pg") == 0)
+    if (driver_name && strcmp(driver_name, "pg") == 0)
         datetime_type = "timestamp";
-    else if (strcmp(driver_name, "dbf") == 0)
+    else if (driver_name && strcmp(driver_name, "dbf") == 0)
         datetime_type = "varchar(22)";
     else
@@ -354 +354 @@
     /* dsn is 'PG:', check default connection settings */
     dsn = NULL;
-    if (strcmp(driver_name, "pg") == 0 &&
+    if (driver_name && strcmp(driver_name, "pg") == 0 &&
         G_strcasecmp(param.dsn->answer, "PG:") == 0) {
         const char *dbname;
@@ -434 +434 @@
     /* check encoding for given driver */
     if (param.encoding->answer) {
-        const char *driver_name;
-
-        driver_name = OGR_Dr_GetName(OGR_DS_GetDriver(Ogr_ds));
-        if (strcmp(driver_name, "ESRI Shapefile") != 0 &&
-            strcmp(driver_name, "DXF") != 0)
-            G_warning(_("Encoding value not supported by OGR driver <%s>"), driver_name);
+        const char *ogr_driver;
+
+        ogr_driver = OGR_Dr_GetName(OGR_DS_GetDriver(Ogr_ds));
+        if (strcmp(ogr_driver, "ESRI Shapefile") != 0 &&
+            strcmp(ogr_driver, "DXF") != 0)
+            G_warning(_("Encoding value not supported by OGR driver <%s>"), ogr_driver);
     }