svn commit: r956707 - /subversion/trunk/subversion/svn/status.c

[da...@apache.org]

Author: dannas
Date: Mon Jun 21 21:33:58 2010
New Revision: 956707

URL: http://svn.apache.org/viewvc?rev=956707&view=rev
Log:
Fix compiler warnings about 'enumeration value not handled in switch'
and 'combined_status already being defined' that appears when compiling 
with gcc.

* subversion/svn/status.c
  (combined_status): See above.

Modified:
    subversion/trunk/subversion/svn/status.c

Modified: subversion/trunk/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?rev=956707&r1=956706&r2=956707&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Mon Jun 21 21:33:58 2010
@@ -65,18 +65,20 @@ generate_status_code(enum svn_wc_status_
 static enum svn_wc_status_kind
 combined_status(const svn_client_status_t *status)
 {
-  enum svn_wc_status_kind combined_status = status->node_status;
+  enum svn_wc_status_kind new_status = status->node_status;
 
   switch (status->node_status)
     {
       case svn_wc_status_modified:
       case svn_wc_status_conflicted:
         /* This value might be the property status */
-        combined_status = status->text_status;
+        new_status = status->text_status;
+        break;
+      default:
         break;
     }
 
-  return combined_status;
+  return new_status;
 }
 
 /* Return the single character representation of the switched column