Mercurial > pidgin.yaz
changeset 10592:d72fffd1b1ad
[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>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Sat, 12 Feb 2005 01:28:04 +0000 |
| parents | 9cb601a1fcfa |
| children | ffabeb0fdc64 |
| files | src/protocols/zephyr/ZGetWGPort.c src/protocols/zephyr/ZVariables.c |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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 */
--- 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);