gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-28 09:22:27 +01:00
Code Issues Projects Releases Wiki Activity

WINGs: Rename copy_file() to wcopy_file()

Browse Source 
...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.
This commit is contained in:
Carlos R. Mafra
2012-01-31 10:26:59 +00:00
parent e9d4930657
commit e1453087f5
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WINGs/WINGs/WUtil.h
View File

@@ -201,7 +201,7 @@ char* wfindfileinarray(WMPropList* array, char *file);
char* wexpandpath(char *path); 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 */ /* don't free the returned string */
char* wgethomedir(void); char* wgethomedir(void);

2
WINGs/findfile.c
View File

@@ -408,7 +408,7 @@ char *wfindfileinarray(WMPropList * array, char *file)
return NULL; 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; FILE *src, *dst;
size_t nread, nwritten; size_t nread, nwritten;

2
WINGs/wcolorpanel.c
View File

@@ -2924,7 +2924,7 @@ static void customPaletteMenuNewFromFile(W_ColorPanel * panel)
/* Copy image to $(gnustepdir)/Library/Colors/ & /* Copy image to $(gnustepdir)/Library/Colors/ &
* Add filename to history menu */ * 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 */ /* filepath is a "local" path now the file has been copied */
wfree(filepath); wfree(filepath);

8
util/getstyle.c
View File

@@ -171,7 +171,7 @@ void findCopyFile(char *dir, char *file)
if (ThemePath) if (ThemePath)
(void)wrmdirhier(ThemePath); (void)wrmdirhier(ThemePath);
} }
copy_file(dir, fullPath, fullPath); wcopy_file(dir, fullPath, fullPath);
free(fullPath); free(fullPath);
} }
@@ -227,7 +227,7 @@ void makeThemePack(WMPropList * style, char *themeName)
p = strrchr(WMGetFromPLString(file), '/'); p = strrchr(WMGetFromPLString(file), '/');
if (p) { if (p) {
copy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file)); wcopy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file));
newPath = wstrdup(p + 1); newPath = wstrdup(p + 1);
WMDeleteFromPLArray(value, 1); WMDeleteFromPLArray(value, 1);
@@ -246,7 +246,7 @@ void makeThemePack(WMPropList * style, char *themeName)
p = strrchr(WMGetFromPLString(file), '/'); p = strrchr(WMGetFromPLString(file), '/');
if (p) { if (p) {
copy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file)); wcopy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file));
newPath = wstrdup(p + 1); newPath = wstrdup(p + 1);
WMDeleteFromPLArray(value, 1); WMDeleteFromPLArray(value, 1);
@@ -260,7 +260,7 @@ void makeThemePack(WMPropList * style, char *themeName)
p = strrchr(WMGetFromPLString(file), '/'); p = strrchr(WMGetFromPLString(file), '/');
if (p) { if (p) {
copy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file)); wcopy_file(themeDir, WMGetFromPLString(file), WMGetFromPLString(file));
newPath = wstrdup(p + 1); newPath = wstrdup(p + 1);
WMDeleteFromPLArray(value, 2); WMDeleteFromPLArray(value, 2);