diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
commit | 502af2167f7c218366666ca4944bd7cc54b5b19a (patch) | |
tree | a91fec5cc9769d260640bd91c6633cb9cf395524 /src/fs/fs_misc.c | |
parent | 03af5a603b7cc53432249d5854cd412aa90dde0d (diff) | |
download | gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.tar.gz gnunet-502af2167f7c218366666ca4944bd7cc54b5b19a.zip |
indentation
Diffstat (limited to 'src/fs/fs_misc.c')
-rw-r--r-- | src/fs/fs_misc.c | 99 |
1 files changed, 47 insertions, 52 deletions
diff --git a/src/fs/fs_misc.c b/src/fs/fs_misc.c index 73dcd4e36..9fa86a5c4 100644 --- a/src/fs/fs_misc.c +++ b/src/fs/fs_misc.c | |||
@@ -35,7 +35,8 @@ | |||
35 | * @return NULL if meta data is useless for suggesting a filename | 35 | * @return NULL if meta data is useless for suggesting a filename |
36 | */ | 36 | */ |
37 | char * | 37 | char * |
38 | GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData *md) | 38 | GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData |
39 | *md) | ||
39 | { | 40 | { |
40 | static const char *mimeMap[][2] = { | 41 | static const char *mimeMap[][2] = { |
41 | {"application/bz2", ".bz2"}, | 42 | {"application/bz2", ".bz2"}, |
@@ -65,12 +66,12 @@ GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData *md | |||
65 | {"application/x-xcf", ".xcf"}, | 66 | {"application/x-xcf", ".xcf"}, |
66 | {"application/x-xfig", ".xfig"}, | 67 | {"application/x-xfig", ".xfig"}, |
67 | {"application/zip", ".zip"}, | 68 | {"application/zip", ".zip"}, |
68 | 69 | ||
69 | {"audio/midi", ".midi"}, | 70 | {"audio/midi", ".midi"}, |
70 | {"audio/mpeg", ".mp3"}, | 71 | {"audio/mpeg", ".mp3"}, |
71 | {"audio/real", ".rm"}, | 72 | {"audio/real", ".rm"}, |
72 | {"audio/x-wav", ".wav"}, | 73 | {"audio/x-wav", ".wav"}, |
73 | 74 | ||
74 | {"image/gif", ".gif"}, | 75 | {"image/gif", ".gif"}, |
75 | {"image/jpeg", ".jpg"}, | 76 | {"image/jpeg", ".jpg"}, |
76 | {"image/pcx", ".pcx"}, | 77 | {"image/pcx", ".pcx"}, |
@@ -78,7 +79,7 @@ GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData *md | |||
78 | {"image/tiff", ".tiff"}, | 79 | {"image/tiff", ".tiff"}, |
79 | {"image/x-ms-bmp", ".bmp"}, | 80 | {"image/x-ms-bmp", ".bmp"}, |
80 | {"image/x-xpixmap", ".xpm"}, | 81 | {"image/x-xpixmap", ".xpm"}, |
81 | 82 | ||
82 | {"text/css", ".css"}, | 83 | {"text/css", ".css"}, |
83 | {"text/html", ".html"}, | 84 | {"text/html", ".html"}, |
84 | {"text/plain", ".txt"}, | 85 | {"text/plain", ".txt"}, |
@@ -93,7 +94,7 @@ GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData *md | |||
93 | {"text/x-perl", ".pl"}, | 94 | {"text/x-perl", ".pl"}, |
94 | {"text/x-python", ".py"}, | 95 | {"text/x-python", ".py"}, |
95 | {"text/x-tex", ".tex"}, | 96 | {"text/x-tex", ".tex"}, |
96 | 97 | ||
97 | {"video/avi", ".avi"}, | 98 | {"video/avi", ".avi"}, |
98 | {"video/mpeg", ".mpeg"}, | 99 | {"video/mpeg", ".mpeg"}, |
99 | {"video/quicktime", ".qt"}, | 100 | {"video/quicktime", ".qt"}, |
@@ -108,56 +109,50 @@ GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData *md | |||
108 | const char *ext; | 109 | const char *ext; |
109 | 110 | ||
110 | ret = GNUNET_CONTAINER_meta_data_get_by_type (md, | 111 | ret = GNUNET_CONTAINER_meta_data_get_by_type (md, |
111 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); | 112 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); |
112 | if (ret != NULL) | 113 | if (ret != NULL) |
113 | return ret; | 114 | return ret; |
114 | ext = NULL; | 115 | ext = NULL; |
115 | mime = GNUNET_CONTAINER_meta_data_get_by_type (md, | 116 | mime = GNUNET_CONTAINER_meta_data_get_by_type (md, |
116 | EXTRACTOR_METATYPE_MIMETYPE); | 117 | EXTRACTOR_METATYPE_MIMETYPE); |
117 | if (mime != NULL) | 118 | if (mime != NULL) |
118 | { | 119 | { |
119 | i = 0; | 120 | i = 0; |
120 | while ( (mimeMap[i][0] != NULL) && | 121 | while ((mimeMap[i][0] != NULL) && (0 != strcmp (mime, mimeMap[i][0]))) |
121 | (0 != strcmp (mime, mimeMap[i][0]))) | 122 | i++; |
122 | i++; | 123 | if (mimeMap[i][1] == NULL) |
123 | if (mimeMap[i][1] == NULL) | 124 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | |
124 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | | 125 | GNUNET_ERROR_TYPE_BULK, |
125 | GNUNET_ERROR_TYPE_BULK, | 126 | _("Did not find mime type `%s' in extension list.\n"), mime); |
126 | _("Did not find mime type `%s' in extension list.\n"), | 127 | else |
127 | mime); | 128 | ext = mimeMap[i][1]; |
128 | else | 129 | GNUNET_free (mime); |
129 | ext = mimeMap[i][1]; | 130 | } |
130 | GNUNET_free (mime); | ||
131 | } | ||
132 | base = GNUNET_CONTAINER_meta_data_get_first_by_types (md, | 131 | base = GNUNET_CONTAINER_meta_data_get_first_by_types (md, |
133 | EXTRACTOR_METATYPE_TITLE, | 132 | EXTRACTOR_METATYPE_TITLE, |
134 | EXTRACTOR_METATYPE_BOOK_TITLE, | 133 | EXTRACTOR_METATYPE_BOOK_TITLE, |
135 | EXTRACTOR_METATYPE_ORIGINAL_TITLE, | 134 | EXTRACTOR_METATYPE_ORIGINAL_TITLE, |
136 | EXTRACTOR_METATYPE_PACKAGE_NAME, | 135 | EXTRACTOR_METATYPE_PACKAGE_NAME, |
137 | EXTRACTOR_METATYPE_URL, | 136 | EXTRACTOR_METATYPE_URL, |
138 | EXTRACTOR_METATYPE_URI, | 137 | EXTRACTOR_METATYPE_URI, |
139 | EXTRACTOR_METATYPE_DESCRIPTION, | 138 | EXTRACTOR_METATYPE_DESCRIPTION, |
140 | EXTRACTOR_METATYPE_ISRC, | 139 | EXTRACTOR_METATYPE_ISRC, |
141 | EXTRACTOR_METATYPE_JOURNAL_NAME, | 140 | EXTRACTOR_METATYPE_JOURNAL_NAME, |
142 | EXTRACTOR_METATYPE_AUTHOR_NAME, | 141 | EXTRACTOR_METATYPE_AUTHOR_NAME, |
143 | EXTRACTOR_METATYPE_SUBJECT, | 142 | EXTRACTOR_METATYPE_SUBJECT, |
144 | EXTRACTOR_METATYPE_ALBUM, | 143 | EXTRACTOR_METATYPE_ALBUM, |
145 | EXTRACTOR_METATYPE_ARTIST, | 144 | EXTRACTOR_METATYPE_ARTIST, |
146 | EXTRACTOR_METATYPE_KEYWORDS, | 145 | EXTRACTOR_METATYPE_KEYWORDS, |
147 | EXTRACTOR_METATYPE_COMMENT, | 146 | EXTRACTOR_METATYPE_COMMENT, |
148 | EXTRACTOR_METATYPE_UNKNOWN, | 147 | EXTRACTOR_METATYPE_UNKNOWN, |
149 | -1); | 148 | -1); |
150 | if ( (base == NULL) && | 149 | if ((base == NULL) && (ext == NULL)) |
151 | (ext == NULL) ) | ||
152 | return NULL; | 150 | return NULL; |
153 | if (base == NULL) | 151 | if (base == NULL) |
154 | return GNUNET_strdup (ext); | 152 | return GNUNET_strdup (ext); |
155 | if (ext == NULL) | 153 | if (ext == NULL) |
156 | return base; | 154 | return base; |
157 | GNUNET_asprintf (&ret, | 155 | GNUNET_asprintf (&ret, "%s%s", base, ext); |
158 | "%s%s", | ||
159 | base, | ||
160 | ext); | ||
161 | GNUNET_free (base); | 156 | GNUNET_free (base); |
162 | return ret; | 157 | return ret; |
163 | } | 158 | } |
@@ -168,7 +163,7 @@ GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData *md | |||
168 | */ | 163 | */ |
169 | unsigned int | 164 | unsigned int |
170 | GNUNET_FS_get_current_year () | 165 | GNUNET_FS_get_current_year () |
171 | { | 166 | { |
172 | time_t tp; | 167 | time_t tp; |
173 | struct tm *t; | 168 | struct tm *t; |
174 | 169 | ||
@@ -195,18 +190,18 @@ GNUNET_FS_year_to_time (unsigned int year) | |||
195 | 190 | ||
196 | memset (&t, 0, sizeof (t)); | 191 | memset (&t, 0, sizeof (t)); |
197 | if (year < 1900) | 192 | if (year < 1900) |
198 | { | 193 | { |
199 | GNUNET_break (0); | 194 | GNUNET_break (0); |
200 | return GNUNET_TIME_absolute_get (); /* now */ | 195 | return GNUNET_TIME_absolute_get (); /* now */ |
201 | } | 196 | } |
202 | t.tm_year = year - 1900; | 197 | t.tm_year = year - 1900; |
203 | t.tm_mday = 1; | 198 | t.tm_mday = 1; |
204 | t.tm_mon = 1; | 199 | t.tm_mon = 1; |
205 | t.tm_wday = 1; | 200 | t.tm_wday = 1; |
206 | t.tm_yday = 1; | 201 | t.tm_yday = 1; |
207 | tp = mktime (&t); | 202 | tp = mktime (&t); |
208 | GNUNET_break (tp != (time_t) -1); | 203 | GNUNET_break (tp != (time_t) - 1); |
209 | ret.abs_value = tp * 1000LL; /* seconds to ms */ | 204 | ret.abs_value = tp * 1000LL; /* seconds to ms */ |
210 | return ret; | 205 | return ret; |
211 | } | 206 | } |
212 | 207 | ||