# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1108171684 0
# Node ID d72fffd1b1ad6c916859a63c033d6bb3b597a6dc
# Parent  9cb601a1fcfa6c355baf5ede6fc6078cf6c86c50
[gaim-migrate @ 11998]
These parts of Zephyr don't include gaim's internal.h, so back out the gstdio changes for now.

committer: Tailor Script <tailor@pidgin.im>

diff -r 9cb601a1fcfa -r d72fffd1b1ad src/protocols/zephyr/ZGetWGPort.c
--- a/src/protocols/zephyr/ZGetWGPort.c	Sat Feb 12 01:13:01 2005 +0000
+++ b/src/protocols/zephyr/ZGetWGPort.c	Sat Feb 12 01:28:04 2005 +0000
@@ -29,7 +29,7 @@
 	(void) sprintf(name, "/tmp/wg.%d", getuid());
 	envptr = name;
     } 
-    if (!(fp = g_fopen(envptr, "r")))
+    if (!(fp = fopen(envptr, "r")))
 	return (-1);
 
     /* if fscanf fails, return -1 via wgport */
diff -r 9cb601a1fcfa -r d72fffd1b1ad src/protocols/zephyr/ZVariables.c
--- a/src/protocols/zephyr/ZVariables.c	Sat Feb 12 01:13:01 2005 +0000
+++ b/src/protocols/zephyr/ZVariables.c	Sat Feb 12 01:28:04 2005 +0000
@@ -59,9 +59,9 @@
     (void) strcpy(varfilebackup, varfile);
     (void) strcat(varfilebackup, ".backup");
 	
-    if (!(fpout = g_fopen(varfilebackup, "w")))
+    if (!(fpout = fopen(varfilebackup, "w")))
 	return (errno);
-    if ((fpin = g_fopen(varfile, "r")) != NULL) {
+    if ((fpin = fopen(varfile, "r")) != NULL) {
 	while (fgets(varbfr, sizeof varbfr, fpin) != (char *) 0) {
 	    if (varbfr[strlen(varbfr)-1] < ' ')
 		varbfr[strlen(varbfr)-1] = '\0';
@@ -78,7 +78,7 @@
 	fprintf(fpout, "%s = %s\n", var, value);
     if (fclose(fpout) == EOF)
 	    return(EIO);		/* can't rely on errno */
-    if (g_rename(varfilebackup, varfile))
+    if (rename(varfilebackup, varfile))
 	return (errno);
     return (ZERR_NONE);
 }	
@@ -95,9 +95,9 @@
     (void) strcpy(varfilebackup, varfile);
     (void) strcat(varfilebackup, ".backup");
 	
-    if (!(fpout = g_fopen(varfilebackup, "w")))
+    if (!(fpout = fopen(varfilebackup, "w")))
 	return (errno);
-    if ((fpin = g_fopen(varfile, "r")) != NULL) {
+    if ((fpin = fopen(varfile, "r")) != NULL) {
 	while (fgets(varbfr, sizeof varbfr, fpin) != (char *) 0) {
 	    if (varbfr[strlen(varbfr)-1] < ' ')
 		varbfr[strlen(varbfr)-1] = '\0';
@@ -108,7 +108,7 @@
     } 
     if (fclose(fpout) == EOF)
 	    return(EIO);		/* errno isn't reliable */
-    if (g_rename(varfilebackup, varfile))
+    if (rename(varfilebackup, varfile))
 	return (errno);
     return (ZERR_NONE);
 }	
@@ -143,7 +143,7 @@
     static char varbfr[512];
     int i;
 	
-    fp = g_fopen(fn, "r");
+    fp = fopen(fn, "r");
     if (!fp)
 	return ((char *)0);