From be98214655822c442802194b3e374b7a98720ac6 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Tue, 15 Jun 2010 20:31:02 +0200 Subject: [PATCH] Remove unused functions make_temp_file and make_unique_file_stream --- src/data/make-file.c | 77 -------------------------------------------- src/data/make-file.h | 12 ------- 2 files changed, 89 deletions(-) diff --git a/src/data/make-file.c b/src/data/make-file.c index f163d5e7..a9e750f9 100644 --- a/src/data/make-file.c +++ b/src/data/make-file.c @@ -39,83 +39,6 @@ #include "gettext.h" #define _(msgid) gettext (msgid) -/* Non ansi compilers may set this */ -#ifndef P_tmpdir -#define P_tmpdir "/tmp" -#endif - -/* Creates a temporary file and stores its name in *FILE_NAME and - a file descriptor for it in *FD. Returns success. Caller is - responsible for freeing *FILE_NAME. */ -int -make_temp_file (int *fd, char **file_name) -{ - const char *parent_dir; - - assert (file_name != NULL); - assert (fd != NULL); - - if (getenv ("TMPDIR") != NULL) - parent_dir = getenv ("TMPDIR"); - else - parent_dir = P_tmpdir; - - *file_name = xmalloc (strlen (parent_dir) + 32); - sprintf (*file_name, "%s/psppXXXXXX", parent_dir); - *fd = mkstemp (*file_name); - if (*fd < 0) - { - msg (ME, _("%s: Creating temporary file: %s."), - *file_name, strerror (errno)); - free (*file_name); - *file_name = NULL; - return 0; - } - return 1; -} - - -/* Creates a temporary file and stores its name in *FILE_NAME and - a file stream for it in *FP. Returns success. Caller is - responsible for freeing *FILE_NAME and for closing *FP */ -int -make_unique_file_stream (FILE **fp, char **file_name) -{ - static int serial = 0; - const char *parent_dir; - - - /* FIXME: - Need to check for pre-existing file name. - Need also to pass in the directory instead of using /tmp - */ - - assert (file_name != NULL); - assert (fp != NULL); - - if (getenv ("TMPDIR") != NULL) - parent_dir = getenv ("TMPDIR"); - else - parent_dir = P_tmpdir; - - *file_name = xmalloc (strlen (parent_dir) + 32); - - - sprintf (*file_name, "%s/pspp%d.png", parent_dir, serial++); - - *fp = fopen(*file_name, "w"); - - if (! *fp ) - { - msg (ME, _("%s: Creating file: %s."), *file_name, strerror (errno)); - free (*file_name); - *file_name = NULL; - return 0; - } - - return 1; -} - struct replace_file { struct ll ll; diff --git a/src/data/make-file.h b/src/data/make-file.h index 31795beb..3861f351 100644 --- a/src/data/make-file.h +++ b/src/data/make-file.h @@ -21,18 +21,6 @@ #include #include -/* Creates a temporary file and stores its name in *FILE_NAME and - a file descriptor for it in *FD. Returns success. Caller is - responsible for freeing *FILE_NAME. */ -int make_temp_file (int *fd, char **file_name); - - -/* Creates a temporary file and stores its name in *FILE_NAME and - a file stream for it in *FP. Returns success. Caller is - responsible for freeing *FILE_NAME. */ -int make_unique_file_stream (FILE **fp, char **file_name) ; - - /* Prepares to atomically replace a (potentially) existing file by a new file, by creating a temporary file with the given PERMISSIONS bits in the same directory as *FILE_NAME. -- 2.30.2