Drop unused lw_vasprintf / lw_asprintf functions from liblwgeom

git-svn-id: http://svn.osgeo.org/postgis/trunk@13651 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in
index 82baaf2bb6f5fd053fcb270c67a4872000e355b0..d5e45f9b32b2b32581f9c378bd4bb8bea4effb19 100644 (file)
--- a/liblwgeom/Makefile.in
+++ b/liblwgeom/Makefile.in
@@ -69,7 +69,6 @@ SA_OBJS = \
        lwsegmentize.o \
        lwlinearreferencing.o \
        lwprint.o \
-       vsprintf.o \
        g_box.o \
        g_serialized.o \
        g_util.o \

diff --git a/liblwgeom/liblwgeom.h.in b/liblwgeom/liblwgeom.h.in
index 32f4f33f75820c666b9a2e838e53f62273f21c74..f2d456d0175e592737235a3b9c00fa7939f874cf 100644 (file)
--- a/liblwgeom/liblwgeom.h.in
+++ b/liblwgeom/liblwgeom.h.in
@@ -269,18 +269,6 @@ void lwerror(const char *fmt, ...);
 void lwdebug(int level, const char *fmt, ...);
 
 
-/* TODO: move these elsewhere */
-extern int lw_vasprintf (char **result, const char *format, va_list args);
-extern int lw_asprintf
-#if __STDC__
-(char **result, const char *format, ...);
-#else
-(result, va_alist);
-char **result;
-va_dcl
-#endif
-
-
 /******************************************************************/
 
 typedef struct {

diff --git a/liblwgeom/vsprintf.c b/liblwgeom/vsprintf.c
deleted file mode 100644 (file)
index 3153ebc..0000000
--- a/liblwgeom/vsprintf.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* Like vsprintf but provides a pointer to malloc'd storage, which must
-   be freed by the caller.
-   Copyright (C) 1994, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#if __STDC__
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
-
-#ifdef TEST
-int global_total_width;
-#endif
-
-/* Make sure we have a va_copy that will work on all platforms */
-#ifndef va_copy
-# ifdef __va_copy
-#  define va_copy(d, s)         __va_copy((d), (s))
-# else
-#  define va_copy(d, s)         memcpy(&(d), &(s), sizeof(va_list))
-# endif
-#endif
-
-int lw_vasprintf (char **result, const char *format, va_list args);
-int lw_asprintf
-#if __STDC__
-(char **result, const char *format, ...);
-#else
-(result, va_alist);
-char **result;
-va_dcl
-#endif
-
-
-static int
-int_vasprintf (result, format, args)
-char **result;
-const char *format;
-va_list *args;
-{
-       const char *p = format;
-       /* Add one to make sure that it is never zero, which might cause malloc
-          to return NULL.  */
-       int total_width = strlen (format) + 1;
-       va_list ap;
-
-       memcpy (&ap, args, sizeof (va_list));
-
-       while (*p != '\0')
-       {
-               if (*p++ == '%')
-               {
-                       while (strchr ("-+ #0", *p))
-                               ++p;
-                       if (*p == '*')
-                       {
-                               ++p;
-                               total_width += abs (va_arg (ap, int));
-                       }
-                       else
-                               total_width += strtoul (p, (char **) &p, 10);
-                       if (*p == '.')
-                       {
-                               ++p;
-                               if (*p == '*')
-                               {
-                                       ++p;
-                                       total_width += abs (va_arg (ap, int));
-                               }
-                               else
-                                       total_width += strtoul (p, (char **) &p, 10);
-                       }
-                       while (strchr ("hlLjtz", *p))
-                               ++p;
-                       /* Should be big enough for any format specifier except %s
-                          and floats.  */
-                       total_width += 30;
-                       switch (*p)
-                       {
-                       case 'd':
-                       case 'i':
-                       case 'o':
-                       case 'u':
-                       case 'x':
-                       case 'X':
-                       case 'c':
-                               (void) va_arg (ap, int);
-                               break;
-                       case 'f':
-                       {
-                               double arg = va_arg (ap, double);
-                               if (arg >= 1.0 || arg <= -1.0)
-                                       /* Since an ieee double can have an exponent of 307, we'll
-                                          make the buffer wide enough to cover the gross case. */
-                                       total_width += 307;
-                       }
-                       break;
-                       case 'e':
-                       case 'E':
-                       case 'g':
-                       case 'G':
-                               (void) va_arg (ap, double);
-                               break;
-                       case 's':
-                               total_width += strlen (va_arg (ap, char *));
-                               break;
-                       case 'p':
-                       case 'n':
-                               (void) va_arg (ap, char *);
-                               break;
-                       }
-                       p++;
-               }
-       }
-#ifdef TEST
-       global_total_width = total_width;
-#endif
-       *result = malloc (total_width);
-       if (*result != NULL)
-               return vsprintf (*result, format, *args);
-       else
-               return 0;
-}
-
-int
-lw_vasprintf (result, format, args)
-char **result;
-const char *format;
-va_list args;
-{
-       va_list temp;
-
-       va_copy(temp, args);
-
-       return int_vasprintf (result, format, &temp);
-}
-
-int
-lw_asprintf
-#if __STDC__
-(char **result, const char *format, ...)
-#else
-(result, va_alist)
-char **result;
-va_dcl
-#endif
-{
-       va_list args;
-       int done;
-
-#if __STDC__
-       va_start (args, format);
-#else
-       char *format;
-       va_start (args);
-       format = va_arg (args, char *);
-#endif
-       done = lw_vasprintf (result, format, args);
-       va_end (args);
-
-       return done;
-}

diff --git a/loader/shp2pgsql-gui.c b/loader/shp2pgsql-gui.c
index 00e823bbb0089facfd9c8bd27e28c79381271102..6ad3b4eea1bd936ce8dfbffe5c431d9af86f2e55 100644 (file)
--- a/loader/shp2pgsql-gui.c
+++ b/loader/shp2pgsql-gui.c
@@ -1542,7 +1542,6 @@ pgui_action_import(GtkWidget *widget, gpointer data)
                strcpy(progress_shapefile, &loader_file_config->shp_file[i]);
                
                /* Display the progress dialog */
-               /* lw_asprintf(&progress_text, _("Importing shapefile %s (%d records)..."), progress_shapefile, ShpLoaderGetRecordCount(state)); */
                snprintf(progress_text, GUIMSG_LINE_MAXLEN, _("Importing shapefile %s (%d records)..."), progress_shapefile, ShpLoaderGetRecordCount(state));
                progress_text[GUIMSG_LINE_MAXLEN] = '\0';
                gtk_label_set_text(GTK_LABEL(label_progress), progress_text);
@@ -1877,7 +1876,6 @@ pgui_action_export(GtkWidget *widget, gpointer data)
                }
 
                /* Update the text */
-               /* lw_asprintf(&progress_text, _("Exporting table %s (%d records)..."), dumper_table_config->table, ShpDumperGetRecordCount(state)); */
                snprintf(progress_text, GUIMSG_LINE_MAXLEN, _("Exporting table %s (%d records)..."), dumper_table_config->table, ShpDumperGetRecordCount(state));
                progress_text[GUIMSG_LINE_MAXLEN] = '\0';
                gtk_label_set_text(GTK_LABEL(label_progress), progress_text);