From e1453087f57b2b2e60fad691fe3df7899b325bbf Mon Sep 17 00:00:00 2001 From: "Carlos R. Mafra" Date: Tue, 31 Jan 2012 10:26:59 +0000 Subject: [PATCH] WINGs: Rename copy_file() to wcopy_file() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...in order to avoid clashes that happen during compilation of wmakerconf. This is a new function in WINGs, so renaming it at this point is not a big deal. Thanks to Rodolfo García for the heads up. --- WINGs/WINGs/WUtil.h | 2 +- WINGs/findfile.c | 2 +- WINGs/wcolorpanel.c | 2 +- util/getstyle.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WINGs/WINGs/WUtil.h b/WINGs/WINGs/WUtil.h index 4872df5f..4ba66626 100644 --- a/WINGs/WINGs/WUtil.h +++ b/WINGs/WINGs/WUtil.h @@ -201,7 +201,7 @@ char* wfindfileinarray(WMPropList* array, char *file); char* wexpandpath(char *path); -int copy_file(char *toPath, char *srcFile, char *destFile); +int wcopy_file(char *toPath, char *srcFile, char *destFile); /* don't free the returned string */ char* wgethomedir(void); diff --git a/WINGs/findfile.c b/WINGs/findfile.c index 70493a55..eb50609d 100644 --- a/WINGs/findfile.c +++ b/WINGs/findfile.c @@ -408,7 +408,7 @@ char *wfindfileinarray(WMPropList * array, char *file) return NULL; } -int copy_file(char *dir, char *src_file, char *dest_file) +int wcopy_file(char *dir, char *src_file, char *dest_file) { FILE *src, *dst; size_t nread, nwritten; diff --git a/WINGs/wcolorpanel.c b/WINGs/wcolorpanel.c index 03e82232..05867662 100644 --- a/WINGs/wcolorpanel.c +++ b/WINGs/wcolorpanel.c @@ -2924,7 +2924,7 @@ static void customPaletteMenuNewFromFile(W_ColorPanel * panel) /* Copy image to $(gnustepdir)/Library/Colors/ & * Add filename to history menu */ - if (copy_file(panel->configurationPath, filepath, filename) == 0) { + if (wcopy_file(panel->configurationPath, filepath, filename) == 0) { /* filepath is a "local" path now the file has been copied */ wfree(filepath); diff --git a/util/getstyle.c b/util/getstyle.c index a988946b..e7afbe40 100644 --- a/util/getstyle.c +++ b/util/getstyle.c @@ -171,7 +171,7 @@ void findCopyFile(char *dir, char *file) if (ThemePath) (void)wrmdirhier(ThemePath); } - copy_file(dir, fullPath, fullPath); + wcopy_file(dir, fullPath, fullPath); free(fullPath); } @@ -227,7 +227,7 @@ void makeThemePack(WMPropList * style, char *themeName) p = strrchr(WMGetFromPLString(file), '/'); if (p) { - copy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file)); + wcopy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file)); newPath = wstrdup(p + 1); WMDeleteFromPLArray(value, 1); @@ -246,7 +246,7 @@ void makeThemePack(WMPropList * style, char *themeName) p = strrchr(WMGetFromPLString(file), '/'); if (p) { - copy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file)); + wcopy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file)); newPath = wstrdup(p + 1); WMDeleteFromPLArray(value, 1); @@ -260,7 +260,7 @@ void makeThemePack(WMPropList * style, char *themeName) p = strrchr(WMGetFromPLString(file), '/'); if (p) { - copy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file)); + wcopy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file)); newPath = wstrdup(p + 1); WMDeleteFromPLArray(value, 2);