From d434db72c74b90452850a7598c0aafdec5c9cf47 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 3 Apr 2018 17:55:56 +0300
Subject: [PATCH] Exact values for default switch case expressions.

---
 njs/njs_lexer.c  |  3 ++-
 njs/njs_string.c |  6 ++++--
 njs/njs_string.h |  3 ++-
 njs/njs_vm.c     | 20 +++++++++++---------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/njs/njs_lexer.c b/njs/njs_lexer.c
index 1b327ff8..3afe573c 100644
--- a/njs/njs_lexer.c
+++ b/njs/njs_lexer.c
@@ -427,7 +427,8 @@ njs_lexer_next_token(njs_lexer_t *lexer)
             lexer->text.length = lexer->start - lexer->text.start;
             return token;
 
-        default:  /* NJS_TOKEN_ILLEGAL */
+        case NJS_TOKEN_ILLEGAL:
+        default:
             lexer->start--;
             return token;
         }
diff --git a/njs/njs_string.c b/njs/njs_string.c
index 03465159..504f47e5 100644
--- a/njs/njs_string.c
+++ b/njs/njs_string.c
@@ -2137,7 +2137,8 @@ njs_string_prototype_search(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
 
             goto done;
 
-        default:  /* NJS_VOID */
+        case NJS_VOID:
+        default:
             goto done;
         }
 
@@ -2452,7 +2453,8 @@ njs_string_prototype_split(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
 
             goto done;
 
-        default: /* NJS_VOID */
+        case NJS_VOID:
+        default:
             break;
         }
     }
diff --git a/njs/njs_string.h b/njs/njs_string.h
index 6e9c82c0..caf8dd39 100644
--- a/njs/njs_string.h
+++ b/njs/njs_string.h
@@ -112,7 +112,8 @@ njs_string_length(njs_utf8_t utf8, u_char *start, size_t size)
     case NJS_STRING_ASCII:
         return size;
 
-    default:  /* NJS_STRING_UTF8 */
+    case NJS_STRING_UTF8:
+    default:
         length = nxt_utf8_length(start, size);
 
         return (length >= 0) ? length : 0;
diff --git a/njs/njs_vm.c b/njs/njs_vm.c
index 87b0cdcf..4d500acc 100644
--- a/njs/njs_vm.c
+++ b/njs/njs_vm.c
@@ -649,9 +649,9 @@ njs_vmcode_property_get(njs_vm_t *vm, njs_value_t *object,
 
         return sizeof(njs_vmcode_prop_get_t);
 
+    case NJS_TRAP_PROPERTY:
+    case NXT_ERROR:
     default:
-        /* NJS_TRAP_PROPERTY */
-        /* NXT_ERROR */
 
         return ret;
     }
@@ -760,9 +760,9 @@ njs_vmcode_property_set(njs_vm_t *vm, njs_value_t *object,
 
         return sizeof(njs_vmcode_prop_set_t);
 
+    case NJS_TRAP_PROPERTY:
+    case NXT_ERROR:
     default:
-        /* NJS_TRAP_PROPERTY */
-        /* NXT_ERROR */
 
         return ret;
     }
@@ -844,9 +844,9 @@ njs_vmcode_property_in(njs_vm_t *vm, njs_value_t *object, njs_value_t *property)
 
         break;
 
+    case NJS_TRAP_PROPERTY:
+    case NXT_ERROR:
     default:
-        /* NJS_TRAP_PROPERTY */
-        /* NXT_ERROR */
 
         return ret;
     }
@@ -946,9 +946,9 @@ njs_vmcode_property_delete(njs_vm_t *vm, njs_value_t *object,
 
         break;
 
+    case NJS_TRAP_PROPERTY:
+    case NXT_ERROR:
     default:
-        /* NJS_TRAP_PROPERTY */
-        /* NXT_ERROR */
 
         return ret;
     }
@@ -1059,7 +1059,9 @@ njs_property_query(njs_vm_t *vm, njs_property_query_t *pq, njs_value_t *object,
         obj = NULL;
         break;
 
-    default:  /* NJS_VOID, NJS_NULL. */
+    case NJS_VOID:
+    case NJS_NULL:
+    default:
         if (nxt_fast_path(njs_is_primitive(property))) {
 
             ret = njs_primitive_value_to_string(vm, &pq->value, property);
-- 
2.47.3