Changeset 68 for pjproject/trunk/pjlib/src/pjlib-test/exception.c

Timestamp:

Nov 21, 2005 4:57:02 PM (18 years ago)

Author:

bennylp

Message:

Changed syntax to support Windows SEH

File:

• pjproject/trunk/pjlib/src/pjlib-test/exception.c (modified) (5 diffs)

pjproject/trunk/pjlib/src/pjlib-test/exception.c

@@ -66 +66 @@
 static int test(void)
 {
+    int rc = 0;
     PJ_USE_EXCEPTION;
-    int rc = 0;
 
     /*
@@ -75 +75 @@
         rc = rc;
     }
-    PJ_CATCH( ID_1 ) {
-        rc = -2;
-    }
-    PJ_DEFAULT {
+    PJ_CATCH_ANY {
         rc = -3;
     }
@@ -96 +93 @@
         rc = -10;
     }
-    PJ_CATCH( ID_1 ) {
-        if (!rc) rc = 0;
-    }
-    PJ_DEFAULT {
+    PJ_CATCH_ANY {
         int id = PJ_GET_EXCEPTION();
-        PJ_LOG(3,("", "...error: got unexpected exception %d (%s)", 
-                  id, pj_exception_id_name(id)));
-        if (!rc) rc = -20;
+        if (id != ID_1) {
+            PJ_LOG(3,("", "...error: got unexpected exception %d (%s)", 
+                      id, pj_exception_id_name(id)));
+            if (!rc) rc = -20;
+        }
     }
     PJ_END;
@@ -118 +114 @@
         rc = -25;
     }
-    PJ_CATCH( ID_1 ) {
-        if (!rc) rc = -30;
-    }
-    PJ_CATCH( ID_2 ) {
-        if (!rc) rc = 0;
-    }
-    PJ_DEFAULT {
-        if (!rc) rc = -40;
+    PJ_CATCH_ANY {
+        switch (PJ_GET_EXCEPTION()) {
+        case ID_1:
+            if (!rc) rc = -30; break;
+        case ID_2:
+            if (!rc) rc = 0; break;
+        default:
+            if (!rc) rc = -40;
+            break;
+        }
     }
     PJ_END;
@@ -140 +138 @@
         rc = -50;
     }
-    PJ_CATCH( ID_2 ) {
-        if (!rc) rc = -60;
-    }
-    PJ_DEFAULT {
-        if (!rc) rc = 0;
+    PJ_CATCH_ANY {
+        switch (PJ_GET_EXCEPTION()) {
+        case ID_1:
+            if (!rc) rc = 0;
+            break;
+        default:
+            if (!rc) rc = -60;
+            break;
+        }
     }
     PJ_END;