From: Steve Hay Date: Fri, 24 Jun 2005 12:27:45 +0000 (+0000) Subject: Make opendir() filename const in Win32-land & friends X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0e06f75d89a762be9731eb40ee14d8535e1ae184;p=p5sagit%2Fp5-mst-13.2.git Make opendir() filename const in Win32-land & friends That fact that it wasn't const already was highlighted by a warning from pp_open_dir() generated by change 24743. Rather than undo the const change in pp_open_dir(), this seems to make more sense. Hope I haven't broken Netware or WinCE. p4raw-id: //depot/perl@24974 --- diff --git a/NetWare/nw5.c b/NetWare/nw5.c index 488111c..397d41a 100644 --- a/NetWare/nw5.c +++ b/NetWare/nw5.c @@ -567,7 +567,7 @@ nw_rmdir(const char *dir) } DIR * -nw_opendir(char *filename) +nw_opendir(const char *filename) { char *buff = NULL; int len = 0; diff --git a/NetWare/nwperlhost.h b/NetWare/nwperlhost.h index 002bc67..a18436e 100644 --- a/NetWare/nwperlhost.h +++ b/NetWare/nwperlhost.h @@ -961,7 +961,7 @@ PerlDirClose(struct IPerlDir* piPerl, DIR *dirp) } DIR* -PerlDirOpen(struct IPerlDir* piPerl, char *filename) +PerlDirOpen(struct IPerlDir* piPerl, const char *filename) { return nw_opendir(filename); } diff --git a/NetWare/nwperlsys.h b/NetWare/nwperlsys.h index 0d731d1..5863e85 100644 --- a/NetWare/nwperlsys.h +++ b/NetWare/nwperlsys.h @@ -184,7 +184,7 @@ PerlDirClose(struct IPerlDir* piPerl, DIR *dirp) } DIR* -PerlDirOpen(struct IPerlDir* piPerl, char *filename) +PerlDirOpen(struct IPerlDir* piPerl, const char *filename) { return nw_opendir(filename); } diff --git a/iperlsys.h b/iperlsys.h index 28e6719..883f935 100644 --- a/iperlsys.h +++ b/iperlsys.h @@ -366,7 +366,7 @@ typedef int (*LPMakedir)(struct IPerlDir*, const char*, int); typedef int (*LPChdir)(struct IPerlDir*, const char*); typedef int (*LPRmdir)(struct IPerlDir*, const char*); typedef int (*LPDirClose)(struct IPerlDir*, DIR*); -typedef DIR* (*LPDirOpen)(struct IPerlDir*, char*); +typedef DIR* (*LPDirOpen)(struct IPerlDir*, const char*); typedef struct direct* (*LPDirRead)(struct IPerlDir*, DIR*); typedef void (*LPDirRewind)(struct IPerlDir*, DIR*); typedef void (*LPDirSeek)(struct IPerlDir*, DIR*, long); diff --git a/win32/include/dirent.h b/win32/include/dirent.h index a669012..5037825 100644 --- a/win32/include/dirent.h +++ b/win32/include/dirent.h @@ -42,7 +42,7 @@ typedef struct _dir_struc } DIR; #if 0 /* these have moved to win32iop.h */ -DIR * win32_opendir(char *filename); +DIR * win32_opendir(const char *filename); struct direct * win32_readdir(DIR *dirp); long win32_telldir(DIR *dirp); void win32_seekdir(DIR *dirp,long loc); diff --git a/win32/perlhost.h b/win32/perlhost.h index 3b6d11d..e7963cc 100644 --- a/win32/perlhost.h +++ b/win32/perlhost.h @@ -1136,7 +1136,7 @@ PerlDirClose(struct IPerlDir* piPerl, DIR *dirp) } DIR* -PerlDirOpen(struct IPerlDir* piPerl, char *filename) +PerlDirOpen(struct IPerlDir* piPerl, const char *filename) { return win32_opendir(filename); } diff --git a/win32/win32.c b/win32/win32.c index d570264..ab653c4 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -732,7 +732,7 @@ Perl_do_exec(pTHX_ char *cmd) * return the pointer to the current file name. */ DllExport DIR * -win32_opendir(char *filename) +win32_opendir(const char *filename) { dTHX; DIR *dirp; diff --git a/win32/win32iop.h b/win32/win32iop.h index 1683e97..c0937f1 100644 --- a/win32/win32iop.h +++ b/win32/win32iop.h @@ -117,7 +117,7 @@ DllExport int win32_open_osfhandle(intptr_t handle, int flags); DllExport intptr_t win32_get_osfhandle(int fd); DllExport FILE* win32_fdupopen(FILE *pf); -DllExport DIR* win32_opendir(char *filename); +DllExport DIR* win32_opendir(const char *filename); DllExport struct direct* win32_readdir(DIR *dirp); DllExport long win32_telldir(DIR *dirp); DllExport void win32_seekdir(DIR *dirp, long loc); diff --git a/wince/perlhost.h b/wince/perlhost.h index 9e93b57..a71f108 100644 --- a/wince/perlhost.h +++ b/wince/perlhost.h @@ -1144,7 +1144,7 @@ PerlDirClose(struct IPerlDir* piPerl, DIR *dirp) } DIR* -PerlDirOpen(struct IPerlDir* piPerl, char *filename) +PerlDirOpen(struct IPerlDir* piPerl, const char *filename) { return win32_opendir(filename); } diff --git a/wince/wince.c b/wince/wince.c index 40b578e..c73c4b8 100644 --- a/wince/wince.c +++ b/wince/wince.c @@ -643,7 +643,7 @@ Perl_do_exec(pTHX_ char *cmd) * return the pointer to the current file name. */ DllExport DIR * -win32_opendir(char *filename) +win32_opendir(const char *filename) { dTHX; DIR *dirp; @@ -822,7 +822,7 @@ win32_closedir(DIR *dirp) /////!!!!!!!!!!! return here and do right stuff!!!! DllExport DIR * -win32_opendir(char *filename) +win32_opendir(const char *filename) { return opendir(filename); }