Re: [Ed2k-gtk-gui-devel] more memleak fixes

[carbonated b. <ra...@ne...>]

ditto, sent wrong patch.  correct one inline.

-- dn
daniel

Index: spawn_core.c
===================================================================
RCS file: /cvsroot/ed2k-gtk-gui/ed2k_gui/ed2k_gui/spawn_core.c,v
retrieving revision 1.14
diff -u -r1.14 spawn_core.c
--- spawn_core.c	10 May 2003 05:08:04 -0000	1.14
+++ spawn_core.c	23 May 2003 12:43:30 -0000
@@ -90,27 +90,9 @@
 	g_return_val_if_fail (*username!=0x00, -1);
 	g_return_val_if_fail (*password!=0x00, -1);
 
-	/* does directory exist at all? (this case shouldn't happen!) */
-	if (access(dir,F_OK|R_OK)!=0)
-		return -1;
-
 	fn = g_strdup_printf("%s/pref.met", dir);
 	g_return_val_if_fail (fn!=NULL, FALSE);
 
-	/* do we have a pref.met file at all? */
-	if (access(fn,F_OK)!=0)
-	{
-		g_free(fn);
-		return 0;
-	}
-
-	/* are we allowed to read it? */
-	if (access(fn,R_OK)!=0)
-	{
-		g_free(fn);
-		return -1;
-	}
-
 	rf = ramfile_new_from_file(fn);
 	g_free(fn);
 
@@ -277,10 +259,17 @@
      */
 	if (1==1)
 	{
-		gchar *indir = g_strdup_printf ("%s/incoming", dir);
-		gchar *tempdir = g_strdup_printf ("%s/temp", dir);
+		gchar *indir;
+		gchar *tempdir;
+
+		indir = g_strdup_printf ("%s/incoming", dir);
 		g_return_val_if_fail (indir!=NULL,FALSE);
-		g_return_val_if_fail (tempdir!=NULL,FALSE);
+
+		if ( (tempdir = g_strdup_printf ("%s/temp", dir) ) == NULL) {
+			g_free (indir);
+			g_critical ("tempdir == NULL");
+			return FALSE;
+		}
 		tag_addedit_string_tag (taglist, "incoming", indir, FALSE, TRUE);
 		tag_addedit_string_tag (taglist, "temp", tempdir, FALSE, TRUE);
 		g_free(indir);