mirror of
https://github.com/cesanta/mongoose.git
synced 2026-11-21 19:51:50 +00:00
Refactor guess_mime_type()
This commit is contained in:
1 parent
e8f050c194
commit
93a6bc501e
2 files changed
+18
-14
No files matched your search
+9
-7
@@ -1758,12 +1758,10 @@ static void static_cb(struct mg_connection *c, int ev, void *ev_data,
|
|||||||
(void) ev_data;
|
(void) ev_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct mg_str guess_content_type(struct mg_str path, const char *extra) {
|
// Known mime types. Keep it outside guess_content_type() function, since
|
||||||
struct mg_str k, v, s = mg_str(extra);
|
// some environments don't like it defined there.
|
||||||
size_t i = 0;
|
|
||||||
|
|
||||||
// clang-format off
|
// clang-format off
|
||||||
struct mg_str tab[] = {
|
static struct mg_str s_known_types[] = {
|
||||||
MG_C_STR("html"), MG_C_STR("text/html; charset=utf-8"),
|
MG_C_STR("html"), MG_C_STR("text/html; charset=utf-8"),
|
||||||
MG_C_STR("htm"), MG_C_STR("text/html; charset=utf-8"),
|
MG_C_STR("htm"), MG_C_STR("text/html; charset=utf-8"),
|
||||||
MG_C_STR("css"), MG_C_STR("text/css; charset=utf-8"),
|
MG_C_STR("css"), MG_C_STR("text/css; charset=utf-8"),
|
||||||
@@ -1798,6 +1796,10 @@ static struct mg_str guess_content_type(struct mg_str path, const char *extra) {
|
|||||||
};
|
};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
|
static struct mg_str guess_content_type(struct mg_str path, const char *extra) {
|
||||||
|
struct mg_str k, v, s = mg_str(extra);
|
||||||
|
size_t i = 0;
|
||||||
|
|
||||||
// Shrink path to its extension only
|
// Shrink path to its extension only
|
||||||
while (i < path.len && path.ptr[path.len - i - 1] != '.') i++;
|
while (i < path.len && path.ptr[path.len - i - 1] != '.') i++;
|
||||||
path.ptr += path.len - i;
|
path.ptr += path.len - i;
|
||||||
@@ -1809,8 +1811,8 @@ static struct mg_str guess_content_type(struct mg_str path, const char *extra) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Process built-in mime types
|
// Process built-in mime types
|
||||||
for (i = 0; tab[i].ptr != NULL; i += 2) {
|
for (i = 0; s_known_types[i].ptr != NULL; i += 2) {
|
||||||
if (mg_strcmp(path, tab[i]) == 0) return tab[i + 1];
|
if (mg_strcmp(path, s_known_types[i]) == 0) return s_known_types[i + 1];
|
||||||
}
|
}
|
||||||
|
|
||||||
return mg_str("text/plain; charset=utf-8");
|
return mg_str("text/plain; charset=utf-8");
|
||||||
|
|||||||
+9
-7
@@ -354,12 +354,10 @@ static void static_cb(struct mg_connection *c, int ev, void *ev_data,
|
|||||||
(void) ev_data;
|
(void) ev_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct mg_str guess_content_type(struct mg_str path, const char *extra) {
|
// Known mime types. Keep it outside guess_content_type() function, since
|
||||||
struct mg_str k, v, s = mg_str(extra);
|
// some environments don't like it defined there.
|
||||||
size_t i = 0;
|
|
||||||
|
|
||||||
// clang-format off
|
// clang-format off
|
||||||
struct mg_str tab[] = {
|
static struct mg_str s_known_types[] = {
|
||||||
MG_C_STR("html"), MG_C_STR("text/html; charset=utf-8"),
|
MG_C_STR("html"), MG_C_STR("text/html; charset=utf-8"),
|
||||||
MG_C_STR("htm"), MG_C_STR("text/html; charset=utf-8"),
|
MG_C_STR("htm"), MG_C_STR("text/html; charset=utf-8"),
|
||||||
MG_C_STR("css"), MG_C_STR("text/css; charset=utf-8"),
|
MG_C_STR("css"), MG_C_STR("text/css; charset=utf-8"),
|
||||||
@@ -394,6 +392,10 @@ static struct mg_str guess_content_type(struct mg_str path, const char *extra) {
|
|||||||
};
|
};
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
||||||
|
static struct mg_str guess_content_type(struct mg_str path, const char *extra) {
|
||||||
|
struct mg_str k, v, s = mg_str(extra);
|
||||||
|
size_t i = 0;
|
||||||
|
|
||||||
// Shrink path to its extension only
|
// Shrink path to its extension only
|
||||||
while (i < path.len && path.ptr[path.len - i - 1] != '.') i++;
|
while (i < path.len && path.ptr[path.len - i - 1] != '.') i++;
|
||||||
path.ptr += path.len - i;
|
path.ptr += path.len - i;
|
||||||
@@ -405,8 +407,8 @@ static struct mg_str guess_content_type(struct mg_str path, const char *extra) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Process built-in mime types
|
// Process built-in mime types
|
||||||
for (i = 0; tab[i].ptr != NULL; i += 2) {
|
for (i = 0; s_known_types[i].ptr != NULL; i += 2) {
|
||||||
if (mg_strcmp(path, tab[i]) == 0) return tab[i + 1];
|
if (mg_strcmp(path, s_known_types[i]) == 0) return s_known_types[i + 1];
|
||||||
}
|
}
|
||||||
|
|
||||||
return mg_str("text/plain; charset=utf-8");
|
return mg_str("text/plain; charset=utf-8");
|
||||||
|
|||||||
Reference in new issue
Block a user