Jacek Caban : vbscript: Use DEFAULT_UNREACHABLE macro where appropriate.

Alexandre Julliard julliard at winehq.org
Wed Mar 13 17:10:07 CDT 2013


Module: wine
Branch: master
Commit: 9eed654e054520888429fb7ea1c9d8cce1c7c776
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9eed654e054520888429fb7ea1c9d8cce1c7c776

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Mar 13 10:43:56 2013 +0100

vbscript: Use DEFAULT_UNREACHABLE macro where appropriate.

---

 dlls/vbscript/compile.c  |    7 ++-----
 dlls/vbscript/global.c   |    4 +---
 dlls/vbscript/vbdisp.c   |    3 +--
 dlls/vbscript/vbscript.c |    3 +--
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c
index fb1974b..c5f3797 100644
--- a/dlls/vbscript/compile.c
+++ b/dlls/vbscript/compile.c
@@ -98,8 +98,7 @@ static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg)
         break;
     case ARG_NONE:
         break;
-    default:
-        assert(0);
+    DEFAULT_UNREACHABLE;
     }
 }
 
@@ -1398,9 +1397,7 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d
         case FUNC_PROPSET:
             invoke_type = VBDISP_SET;
             break;
-        default:
-            assert(0);
-            return E_FAIL;
+        DEFAULT_UNREACHABLE;
         }
 
         assert(!desc->entries[invoke_type]);
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index 9c9cd41..4a5a277 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -1010,9 +1010,7 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA
     case 4:
         FIXME("unsupported compare argument %s\n", debugstr_variant(args));
         return E_NOTIMPL;
-    default:
-        assert(0);
-        return E_FAIL;
+    DEFAULT_UNREACHABLE;
     }
 
     if(startv) {
diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index f06a5b6..f075163 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -172,8 +172,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f
                 V_BSTR(res) = ret;
                 break;
             }
-            default:
-                assert(0);
+            DEFAULT_UNREACHABLE;
             }
             return S_OK;
         }
diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c
index 48dd18c..b594b07 100644
--- a/dlls/vbscript/vbscript.c
+++ b/dlls/vbscript/vbscript.c
@@ -216,8 +216,7 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state)
         break;
     case SCRIPTSTATE_CLOSED:
         break;
-    default:
-        assert(0);
+    DEFAULT_UNREACHABLE;
     }
 }
 




More information about the wine-cvs mailing list