summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-05-10 11:46:11 +0000
committerallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-05-10 11:46:11 +0000
commit96c60b1271238d6e7361c149596046d8839355ae (patch)
treecaee928f8dca6d7af650212ba25953fc39527b13 /src
parent1b1b43da4516f0dcdf0b4a91d55ea0ac7c1c0b5a (diff)
CCTK_mkdir is now replaced by
CCTK_CreateDirectory which creates a directory and any needed parents CCTK_mkdir will be removed in Beta 9 git-svn-id: http://svn.cactuscode.org/flesh/trunk@1636 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src')
-rw-r--r--src/util/File.c23
-rw-r--r--src/util/Misc.c11
2 files changed, 24 insertions, 10 deletions
diff --git a/src/util/File.c b/src/util/File.c
index 2c75ae8a..562e0c6b 100644
--- a/src/util/File.c
+++ b/src/util/File.c
@@ -42,7 +42,9 @@ CCTK_FILEVERSION(util_File_c)
#endif /* HAVE_MODE_T */
-int CCTK_MkDirs(const char *pathname, int mode);
+int CCTK_CreateDirectory(const char *pathname, int mode);
+
+/* DEPRECATED IN BETA 9 */
/*@@
@routine CCTK_mkdir
@@ -110,21 +112,23 @@ int CCTK_mkdir(const char *dir)
retval = 0;
#endif
- retval = CCTK_MkDirs(dir, 0755);
+ retval = CCTK_CreateDirectory(dir, 0755);
return retval;
}
-void FMODIFIER FORTRAN_NAME(CCTK_mkdir)(int *ierr, ONE_FORTSTRING_ARG)
+void CCTK_FCALL CCTK_FNAME(CCTK_mkdir)
+ (int *ierr, ONE_FORTSTRING_ARG)
{
ONE_FORTSTRING_CREATE(arg1)
*ierr = CCTK_mkdir(arg1);
free(arg1);
}
+/* END DEPRECATED IN BETA 9 */
/*@@
- @routine CCTK_MkDirs
+ @routine CCTK_CreateDirectory
@date Tue May 2 21:38:48 2000
@author Tom Goodale
@desc
@@ -137,7 +141,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_mkdir)(int *ierr, ONE_FORTSTRING_ARG)
@endhistory
@@*/
-int CCTK_MkDirs(const char *pathname, int mode)
+int CCTK_CreateDirectory(const char *pathname, int mode)
{
int retval;
const char *path;
@@ -235,3 +239,12 @@ int CCTK_MkDirs(const char *pathname, int mode)
return retval;
}
+
+void CCTK_FCALL CCTK_FNAME(CCTK_CreateDirectory)
+ (int *ierr, TWO_FORTSTRINGS_ARGS)
+{
+ TWO_FORTSTRINGS_CREATE(arg1,arg2)
+ *ierr = CCTK_CreateDirectory(arg1,arg2);
+ free(arg1);
+ free(arg2);
+}
diff --git a/src/util/Misc.c b/src/util/Misc.c
index 261d2a17..560e1301 100644
--- a/src/util/Misc.c
+++ b/src/util/Misc.c
@@ -102,7 +102,8 @@ int CCTK_Equals(const char *string1, const char *string2)
return retval;
}
-int FMODIFIER FORTRAN_NAME(CCTK_Equals)(const char **arg1,ONE_FORTSTRING_ARG)
+int CCTK_FCALL CCTK_FNAME(CCTK_Equals)
+ (const char **arg1,ONE_FORTSTRING_ARG)
{
int retval;
ONE_FORTSTRING_CREATE(arg2)
@@ -821,7 +822,8 @@ void CCTK_PrintString(char *data)
printf("%s\n",data);
}
-void FMODIFIER FORTRAN_NAME(CCTK_PrintString)(char **arg1)
+void CCTK_FCALL CCTK_FNAME(CCTK_PrintString)
+ (char **arg1)
{
CCTK_PrintString(*arg1);
}
@@ -915,9 +917,8 @@ int CCTK_RegexMatch(const char *string,
@@*/
-void FORTRAN_NAME(CCTK_FortranString)(CCTK_INT *nchar,
- char **cstring,
- ONE_FORTSTRING_ARG)
+void CCTK_FCALL CCTK_FNAME(CCTK_FortranString)
+ (CCTK_INT *nchar,char **cstring,ONE_FORTSTRING_ARG)
{
int i;
ONE_FORTSTRING_CREATE(fstring)