Hi

A set of small cleanups due to GCC warnings.

- Lauri
>From ad36ea30124afc52e9f886664de67add51e664d7 Mon Sep 17 00:00:00 2001
From: Lauri Kasanen <[email protected]>
Date: Thu, 3 May 2012 15:01:06 +0300
Subject: [PATCH 1/6] request: no-op cleanups

Remove always true else if check, and move one common if check one level above.

No functional changes.

Signed-off-by: Lauri Kasanen <[email protected]>
---
 src/mk_request.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/mk_request.c b/src/mk_request.c
index a12ce03..807d3c9 100644
--- a/src/mk_request.c
+++ b/src/mk_request.c
@@ -609,11 +609,13 @@ int mk_handler_write(int socket, struct client_session 
*cs)
 
         /* Request not processed also no plugin has take some action */
         /* Request with data to send by static file sender */
-        if (sr_node->bytes_to_send > 0 && !sr_node->handled_by) {
-            final_status = mk_http_send_file(cs, sr_node);
-        }
-        else if (sr_node->bytes_to_send < 0 && !sr_node->handled_by) {
-            final_status = mk_request_process(cs, sr_node);
+        if (!sr_node->handled_by) {
+            if (sr_node->bytes_to_send > 0) {
+                final_status = mk_http_send_file(cs, sr_node);
+            }
+            else if (sr_node->bytes_to_send < 0) {
+                final_status = mk_request_process(cs, sr_node);
+            }
         }
 
         /*
@@ -623,7 +625,7 @@ int mk_handler_write(int socket, struct client_session *cs)
         if (final_status > 0) {
             return final_status;
         }
-        else if (final_status <= 0) {
+        else {
             /* STAGE_40, request has ended */
             mk_plugin_stage_run(MK_PLUGIN_STAGE_40, cs->socket,
                                 NULL, cs, sr_node);
-- 
1.7.2.1

_______________________________________________
Monkey mailing list
[email protected]
http://lists.monkey-project.com/listinfo/monkey

Reply via email to