diff lib/config_file.c @ 198:8fea1b1a2ec6

2003-6-22 Brian Masney <[e-mail]> * lib/config_file.c lib/gftp.h - renamed parse_args to gftp_config_parse_args() and removed the static declaration * lib/protocols.c (gftp_request_destroy) - fixed memory problem with the new local configuration interface * src/gtk/gftp-gtk.c - added gftp_gtk_config_(read|write)_color(). I am overriding the read and write functions for gftp_option_type_color to be these functions. This is so that I can use a GdkColor structure instead of a gftp_color structure * src/gtk/misc-gtk.c - when destroying the dialogs, set the pointers to NULL before we call the callback functions. This is to make sure that they aren't being used in the callbacks * TODO - updated

--- a/lib/config_file.c	Sun Jun 22 22:54:02 2003 +0000
+++ b/lib/config_file.c	Mon Jun 23 01:07:05 2003 +0000
@@ -227,8 +227,8 @@
 }
 
 
-static int
-parse_args (char *str, int numargs, int lineno, char **first, ...)
+int
+gftp_config_parse_args (char *str, int numargs, int lineno, char **first, ...)
 {
   char *curpos, *endpos, *pos, **dest, tempchar;
   int ret, has_colon;
@@ -384,8 +384,8 @@
   char *tempstr;
 
   tempext = g_malloc (sizeof (*tempext));
-  parse_args (buf, 4, line, &tempext->ext, &tempext->filename,
-              &tempext->ascii_binary, &tempext->view_program);
+  gftp_config_parse_args (buf, 4, line, &tempext->ext, &tempext->filename,
+                          &tempext->ascii_binary, &tempext->view_program);
  
   if ((tempstr = get_xpm_path (tempext->filename, 1)) != NULL)
     g_free (tempstr);
@@ -931,7 +931,7 @@
   if (cv->flags & GFTP_CVARS_FLAGS_DYNMEM && cv->value != NULL)
     g_free (cv->value);
 
-  parse_args (str, 3, line, &red, &green, &blue);
+  gftp_config_parse_args (str, 3, line, &red, &green, &blue);
 
   color = g_malloc (sizeof (*color));
   color->red = strtol (red, NULL, 16);