X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fmake-file.c;h=fdbb4643ebf7bb5e35ad219a81d4ad76f2384440;hb=c8e1adf66ea2110fc8a3f489c864e5ea93105031;hp=3cbf00623d200e22075c8c06f61500bf1d5a0c80;hpb=daff2c425198e7b2321b40c08dcd3f5f975ac3b1;p=pspp diff --git a/src/data/make-file.c b/src/data/make-file.c index 3cbf00623d..fdbb4643eb 100644 --- a/src/data/make-file.c +++ b/src/data/make-file.c @@ -19,7 +19,6 @@ #include "data/make-file.h" #include "libpspp/i18n.h" -#include #include #include #include @@ -148,7 +147,7 @@ Trename (TCHAR const *src, TCHAR const *dst) return -1; } -TCHAR * +TCHAR * convert_to_filename_encoding (const char *s, size_t len, const char *current_encoding) { const char *enc = current_encoding; @@ -166,10 +165,10 @@ convert_to_filename_encoding (const char *s, size_t len, const char *current_enc #define Topen open #define Tstat stat -TCHAR * +TCHAR * convert_to_filename_encoding (const char *s, size_t len UNUSED, const char *current_encoding UNUSED) { - /* Non-windows systems don't care about the encoding. + /* Non-windows systems don't care about the encoding. The string is copied here, to be consistent with the w32 case. */ return xstrdup (s); } @@ -186,11 +185,11 @@ struct replace_file char *tmp_name_verbatim; const char *file_name_verbatim; }; - + static struct ll_list all_files = LL_INITIALIZER (all_files); static void free_replace_file (struct replace_file *); -static void unlink_replace_files (void); +static void unlink_replace_files (int sig); struct replace_file * replace_file_start (const struct file_handle *fh, const char *mode, @@ -214,7 +213,7 @@ replace_file_start (const struct file_handle *fh, const char *mode, fd = Topen (Tfile_name, O_WRONLY); if (fd < 0) { - saved_errno = errno; + saved_errno = errno; msg (ME, _("Opening %s for writing: %s."), file_name, strerror (saved_errno)); free (Tfile_name); @@ -225,7 +224,7 @@ replace_file_start (const struct file_handle *fh, const char *mode, *fp = fdopen (fd, mode); if (*fp == NULL) { - saved_errno = errno; + saved_errno = errno; msg (ME, _("Opening stream for %s: %s."), file_name, strerror (saved_errno)); close (fd); @@ -370,7 +369,7 @@ free_replace_file (struct replace_file *rf) } static void -unlink_replace_files (void) +unlink_replace_files (int sig UNUSED) { struct replace_file *rf;