]> granicus.if.org Git - postgis/commitdiff
Fix memory scope error (resulting in segfault) accidentally introduced by the command...
authorMark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
Thu, 17 Dec 2009 11:11:46 +0000 (11:11 +0000)
committerMark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
Thu, 17 Dec 2009 11:11:46 +0000 (11:11 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@5018 b70326c6-7e19-0410-871a-916f4a2858ee

loader/shp2pgsql-gui.c

index e3b30a40d3cadffa5bde9009913100779ca623a6..5ccd1a3ca1079ff2102b4016f3fd67e53e4fea86 100644 (file)
@@ -54,6 +54,7 @@ static char *pgui_errmsg = NULL;
 static PGconn *pg_connection;
 static SHPLOADERCONFIG *config;
 static SHPLOADERSTATE *state;
+static SHPCONNECTIONCONFIG *conn;
 
 
 /*
@@ -1033,8 +1034,6 @@ usage()
 int
 main(int argc, char *argv[])
 {
-       SHPLOADERCONFIG *config;
-       SHPCONNECTIONCONFIG *conn;
        char c;
 
        /* Parse command line options and set configuration */
@@ -1070,10 +1069,6 @@ main(int argc, char *argv[])
                                exit(0);
                }
        }
-       
-       /* Setup the configuration */
-       config = malloc(sizeof(SHPLOADERCONFIG));
-       set_config_defaults(config);
 
        /* initialize the GTK stack */
        gtk_init(&argc, &argv);