diff options
| author | Alasdair Kergon <agk@redhat.com> | 2006-01-31 14:50:38 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2006-01-31 14:50:38 +0000 |
| commit | 5e3bd86778673cfe316ff57bb358b08f7aa3e476 (patch) | |
| tree | 761d7b6d6c1aff04eb88ba1a44c73f90f7098887 /libdm/libdm-file.c | |
| parent | c55b141005e4b0354267b77d9c52bde5d5a8d9cb (diff) | |
| download | lvm2-5e3bd86778673cfe316ff57bb358b08f7aa3e476.tar.gz lvm2-5e3bd86778673cfe316ff57bb358b08f7aa3e476.tar.xz lvm2-5e3bd86778673cfe316ff57bb358b08f7aa3e476.zip | |
Rename _log to dm_log and export.
Fix misc compile-time warnings.
Diffstat (limited to 'libdm/libdm-file.c')
| -rw-r--r-- | libdm/libdm-file.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libdm/libdm-file.c b/libdm/libdm-file.c index 06f5628f..dbbca599 100644 --- a/libdm/libdm-file.c +++ b/libdm/libdm-file.c @@ -20,10 +20,6 @@ #include <fcntl.h> #include <dirent.h> -#ifdef linux -# include <malloc.h> -#endif - static int _create_dir_recursive(const char *dir) { char *orig, *s; @@ -31,7 +27,7 @@ static int _create_dir_recursive(const char *dir) log_verbose("Creating directory \"%s\"", dir); /* Create parent directories */ - orig = s = strdup(dir); + orig = s = dm_strdup(dir); while ((s = strchr(s, '/')) != NULL) { *s = '\0'; if (*orig) { @@ -39,13 +35,13 @@ static int _create_dir_recursive(const char *dir) if (rc < 0 && errno != EEXIST) { log_error("%s: mkdir failed: %s", orig, strerror(errno)); - free(orig); + dm_free(orig); return 0; } } *s++ = '/'; } - free(orig); + dm_free(orig); /* Create final directory */ rc = mkdir(dir, 0777); |