diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-04-29 21:52:48 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-04-29 21:52:48 +0000 |
commit | 40d4dff74eaae781fb99cea505457738c4601e47 (patch) | |
tree | 940d91f8b5fc22cd568f2b2393a3d5827ad02adf /src/fs/fs_file_information.c | |
parent | 33fa9a700082513870a85b56c7359e72ed29035f (diff) | |
download | gnunet-40d4dff74eaae781fb99cea505457738c4601e47.tar.gz gnunet-40d4dff74eaae781fb99cea505457738c4601e47.zip |
cleaning up FileInformation struct
Diffstat (limited to 'src/fs/fs_file_information.c')
-rw-r--r-- | src/fs/fs_file_information.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c index d1ab980e3..8a5360db1 100644 --- a/src/fs/fs_file_information.c +++ b/src/fs/fs_file_information.c | |||
@@ -231,7 +231,7 @@ GNUNET_FS_file_information_create_from_file (void *client_info, | |||
231 | anonymity, | 231 | anonymity, |
232 | priority, | 232 | priority, |
233 | expirationTime); | 233 | expirationTime); |
234 | ret->data.file.filename = GNUNET_strdup (filename); | 234 | ret->filename = GNUNET_strdup (filename); |
235 | fn = filename; | 235 | fn = filename; |
236 | while (NULL != (ss = strstr (fn, | 236 | while (NULL != (ss = strstr (fn, |
237 | DIR_SEPARATOR_STR))) | 237 | DIR_SEPARATOR_STR))) |
@@ -677,7 +677,7 @@ GNUNET_FS_file_information_create_from_directory (void *client_info, | |||
677 | "text/plain", | 677 | "text/plain", |
678 | fn, | 678 | fn, |
679 | strlen (fn) + 1); | 679 | strlen (fn) + 1); |
680 | ret->data.dir.dirname = GNUNET_strdup (filename); | 680 | ret->filename = GNUNET_strdup (filename); |
681 | GNUNET_FS_file_information_sync (ret); | 681 | GNUNET_FS_file_information_sync (ret); |
682 | return ret; | 682 | return ret; |
683 | } | 683 | } |
@@ -845,7 +845,6 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi, | |||
845 | &fi->expirationTime, | 845 | &fi->expirationTime, |
846 | &fi->client_info); | 846 | &fi->client_info); |
847 | GNUNET_free_non_null (fi->data.dir.dir_data); | 847 | GNUNET_free_non_null (fi->data.dir.dir_data); |
848 | GNUNET_free_non_null (fi->data.dir.dirname); | ||
849 | } | 848 | } |
850 | else | 849 | else |
851 | { | 850 | { |
@@ -863,6 +862,7 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi, | |||
863 | &fi->expirationTime, | 862 | &fi->expirationTime, |
864 | &fi->client_info); | 863 | &fi->client_info); |
865 | } | 864 | } |
865 | GNUNET_free_non_null (fi->filename); | ||
866 | GNUNET_free_non_null (fi->serialization); | 866 | GNUNET_free_non_null (fi->serialization); |
867 | GNUNET_free_non_null (fi->emsg); | 867 | GNUNET_free_non_null (fi->emsg); |
868 | GNUNET_free_non_null (fi->chk_uri); | 868 | GNUNET_free_non_null (fi->chk_uri); |