VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-13 14:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some useless 'return' statements.

Browse Source 
Fix style.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1715581 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christophe Jaillet
2015-11-21 21:37:09 +00:00
parent 43863e60ef
commit 53b1fd652f
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mappers/mod_imagemap.c
View File

@ -486,8 +486,6 @@ static void menu_header(request_rec *r, char *menu)
ap_escape_html(r->pool, r->uri), ap_escape_html(r->pool, r->uri),
"</h1>\n<hr />\n\n", NULL); "</h1>\n<hr />\n\n", NULL);
} }
return;
} }
static void menu_blank(request_rec *r, char *menu) static void menu_blank(request_rec *r, char *menu)
@ -501,11 +499,11 @@ static void menu_blank(request_rec *r, char *menu)
else if (!strcasecmp(menu, "unformatted")) { else if (!strcasecmp(menu, "unformatted")) {
ap_rputs("\n", r); ap_rputs("\n", r);
} }
return;
} }
static void menu_comment(request_rec *r, char *menu, char *comment) static void menu_comment(request_rec *r, char *menu, char *comment)
{ {
/* comments are ignored in the 'formatted' form */
if (!strcasecmp(menu, "formatted")) { if (!strcasecmp(menu, "formatted")) {
ap_rputs("\n", r); /* print just a newline if 'formatted' */ ap_rputs("\n", r); /* print just a newline if 'formatted' */
} }
@ -515,8 +513,6 @@ static void menu_comment(request_rec *r, char *menu, char *comment)
else if (!strcasecmp(menu, "unformatted") && *comment) { else if (!strcasecmp(menu, "unformatted") && *comment) {
ap_rvputs(r, comment, "\n", NULL); ap_rvputs(r, comment, "\n", NULL);
} }
return; /* comments are ignored in the
'formatted' form */
} }
static void menu_default(request_rec *r, const char *menu, const char *href, const char *text) static void menu_default(request_rec *r, const char *menu, const char *href, const char *text)
@ -541,7 +537,6 @@ static void menu_default(request_rec *r, const char *menu, const char *href, con
else if (!strcasecmp(menu, "unformatted")) { else if (!strcasecmp(menu, "unformatted")) {
ap_rvputs(r, "<a href=\"", ehref, "\">", etext, "</a>", NULL); ap_rvputs(r, "<a href=\"", ehref, "\">", etext, "</a>", NULL);
} }
return;
} }
static void menu_directive(request_rec *r, const char *menu, const char *href, const char *text) static void menu_directive(request_rec *r, const char *menu, const char *href, const char *text)
@ -566,7 +561,6 @@ static void menu_directive(request_rec *r, const char *menu, const char *href, c
else if (!strcasecmp(menu, "unformatted")) { else if (!strcasecmp(menu, "unformatted")) {
ap_rvputs(r, "<a href=\"", ehref, "\">", etext, "</a>", NULL); ap_rvputs(r, "<a href=\"", ehref, "\">", etext, "</a>", NULL);
} }
return;
} }
static void menu_footer(request_rec *r) static void menu_footer(request_rec *r)

16
modules/mappers/mod_negotiation.c
View File

@ -791,8 +791,9 @@ static enum header_state get_header_line(char *buffer, int len, apr_file_t *map)
*/ */
while (c != '\n' && apr_isspace(c)) { while (c != '\n' && apr_isspace(c)) {
if(apr_file_getc(&c, map) != APR_SUCCESS) if (apr_file_getc(&c, map) != APR_SUCCESS) {
break; break;
}
} }
apr_file_ungetc(c, map); apr_file_ungetc(c, map);
@ -1058,10 +1059,9 @@ static int read_type_map(apr_file_t **map, negotiation_state *neg,
return OK; return OK;
} }
/* Sort function used by read_types_multi. */ /* Sort function used by read_types_multi. */
static int variantsortf(var_rec *a, var_rec *b) { static int variantsortf(var_rec *a, var_rec *b)
{
/* First key is the source quality, sort in descending order. */ /* First key is the source quality, sort in descending order. */
/* XXX: note that we currently implement no method of setting the /* XXX: note that we currently implement no method of setting the
@ -1727,7 +1727,6 @@ static void set_language_quality(negotiation_state *neg, var_rec *variant)
} }
} }
} }
return;
} }
/* Determining the content length --- if the map didn't tell us, /* Determining the content length --- if the map didn't tell us,
@ -2967,8 +2966,9 @@ static int handle_map_file(request_rec *r)
char *udir; char *udir;
const char *new_req; const char *new_req;
if(strcmp(r->handler,MAP_FILE_MAGIC_TYPE) && strcmp(r->handler,"type-map")) if (strcmp(r->handler, MAP_FILE_MAGIC_TYPE) && strcmp(r->handler, "type-map")) {
return DECLINED; return DECLINED;
}
neg = parse_accept_headers(r); neg = parse_accept_headers(r);
if ((res = read_type_map(&map, neg, r))) { if ((res = read_type_map(&map, neg, r))) {
@ -2976,7 +2976,9 @@ static int handle_map_file(request_rec *r)
} }
res = do_negotiation(r, neg, &best, 0); res = do_negotiation(r, neg, &best, 0);
if (res != 0) return res; if (res != 0) {
return res;
}
if (best->body) if (best->body)
{ {