Merge topic branch t/sf_float into pu

[paraslash.git] / file_write.c

diff --git a/file_write.c b/file_write.c
index 64153178e969191201b869fe6bfa34f37f61af23..0a5d6bbaf2505618edecde49063036d08a876894 100644 (file)
--- a/file_write.c
+++ b/file_write.c
@@ -31,13 +31,8 @@ struct private_file_write_data {
  */
 __must_check __malloc static char *random_filename(void)
 {
-       char *result, *home = para_homedir();
-
        srandom(clock_get_realtime(NULL)->tv_usec);
-       result = make_message("%s/.paraslash/%08ld", home,
-               para_random(99999999));
-       free(home);
-       return result;
+       return make_message("%s/%08ld", get_confdir(), para_random(99999999));
 }
 
 static int prepare_output_file(struct writer_node *wn)
@@ -64,7 +59,7 @@ static int prepare_output_file(struct writer_node *wn)
                close(fd);
                return ret;
        }
-       pfwd = wn->private_data = para_calloc(sizeof(*pfwd));
+       pfwd = wn->private_data = zalloc(sizeof(*pfwd));
        pfwd->fd = fd;
        return 1;
 }