Commit d4b19cf
test,n-api: re-write test_error in C
PR-URL: #20244
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>1 parent 3bf736e commit d4b19cf
2 files changed
Lines changed: 16 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2,7 +2,7 @@ | |||
| 2 | 2 | "targets": [ | |
| 3 | 3 | { | |
| 4 | 4 | "target_name": "test_error", | |
| 5 | - "sources": [ "test_error.cc" ] | ||
| 5 | + "sources": [ "test_error.c" ] | ||
| 6 | 6 | } | |
| 7 | 7 | ] | |
| 8 | 8 | } | |
Lines changed: 15 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,7 +4,7 @@ | |||
| 4 | 4 | napi_value checkError(napi_env env, napi_callback_info info) { | |
| 5 | 5 | size_t argc = 1; | |
| 6 | 6 | napi_value args[1]; | |
| 7 | - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr)); | ||
| 7 | + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL)); | ||
| 8 | 8 | ||
| 9 | 9 | bool r; | |
| 10 | 10 | NAPI_CALL(env, napi_is_error(env, args[0], &r)); | |
@@ -20,43 +20,43 @@ napi_value throwExistingError(napi_env env, napi_callback_info info) { | |||
| 20 | 20 | napi_value error; | |
| 21 | 21 | NAPI_CALL(env, napi_create_string_utf8( | |
| 22 | 22 | env, "existing error", NAPI_AUTO_LENGTH, &message)); | |
| 23 | - NAPI_CALL(env, napi_create_error(env, nullptr, message, &error)); | ||
| 23 | + NAPI_CALL(env, napi_create_error(env, NULL, message, &error)); | ||
| 24 | 24 | NAPI_CALL(env, napi_throw(env, error)); | |
| 25 | - return nullptr; | ||
| 25 | + return NULL; | ||
| 26 | 26 | } | |
| 27 | 27 | ||
| 28 | 28 | napi_value throwError(napi_env env, napi_callback_info info) { | |
| 29 | - NAPI_CALL(env, napi_throw_error(env, nullptr, "error")); | ||
| 30 | - return nullptr; | ||
| 29 | + NAPI_CALL(env, napi_throw_error(env, NULL, "error")); | ||
| 30 | + return NULL; | ||
| 31 | 31 | } | |
| 32 | 32 | ||
| 33 | 33 | napi_value throwRangeError(napi_env env, napi_callback_info info) { | |
| 34 | - NAPI_CALL(env, napi_throw_range_error(env, nullptr, "range error")); | ||
| 35 | - return nullptr; | ||
| 34 | + NAPI_CALL(env, napi_throw_range_error(env, NULL, "range error")); | ||
| 35 | + return NULL; | ||
| 36 | 36 | } | |
| 37 | 37 | ||
| 38 | 38 | napi_value throwTypeError(napi_env env, napi_callback_info info) { | |
| 39 | - NAPI_CALL(env, napi_throw_type_error(env, nullptr, "type error")); | ||
| 40 | - return nullptr; | ||
| 39 | + NAPI_CALL(env, napi_throw_type_error(env, NULL, "type error")); | ||
| 40 | + return NULL; | ||
| 41 | 41 | } | |
| 42 | 42 | ||
| 43 | 43 | napi_value throwErrorCode(napi_env env, napi_callback_info info) { | |
| 44 | 44 | NAPI_CALL(env, napi_throw_error(env, "ERR_TEST_CODE", "Error [error]")); | |
| 45 | - return nullptr; | ||
| 45 | + return NULL; | ||
| 46 | 46 | } | |
| 47 | 47 | ||
| 48 | 48 | napi_value throwRangeErrorCode(napi_env env, napi_callback_info info) { | |
| 49 | 49 | NAPI_CALL(env, napi_throw_range_error(env, | |
| 50 | 50 | "ERR_TEST_CODE", | |
| 51 | 51 | "RangeError [range error]")); | |
| 52 | - return nullptr; | ||
| 52 | + return NULL; | ||
| 53 | 53 | } | |
| 54 | 54 | ||
| 55 | 55 | napi_value throwTypeErrorCode(napi_env env, napi_callback_info info) { | |
| 56 | 56 | NAPI_CALL(env, napi_throw_type_error(env, | |
| 57 | 57 | "ERR_TEST_CODE", | |
| 58 | 58 | "TypeError [type error]")); | |
| 59 | - return nullptr; | ||
| 59 | + return NULL; | ||
| 60 | 60 | } | |
| 61 | 61 | ||
| 62 | 62 | ||
@@ -65,7 +65,7 @@ napi_value createError(napi_env env, napi_callback_info info) { | |||
| 65 | 65 | napi_value message; | |
| 66 | 66 | NAPI_CALL(env, napi_create_string_utf8( | |
| 67 | 67 | env, "error", NAPI_AUTO_LENGTH, &message)); | |
| 68 | - NAPI_CALL(env, napi_create_error(env, nullptr, message, &result)); | ||
| 68 | + NAPI_CALL(env, napi_create_error(env, NULL, message, &result)); | ||
| 69 | 69 | return result; | |
| 70 | 70 | } | |
| 71 | 71 | ||
@@ -74,7 +74,7 @@ napi_value createRangeError(napi_env env, napi_callback_info info) { | |||
| 74 | 74 | napi_value message; | |
| 75 | 75 | NAPI_CALL(env, napi_create_string_utf8( | |
| 76 | 76 | env, "range error", NAPI_AUTO_LENGTH, &message)); | |
| 77 | - NAPI_CALL(env, napi_create_range_error(env, nullptr, message, &result)); | ||
| 77 | + NAPI_CALL(env, napi_create_range_error(env, NULL, message, &result)); | ||
| 78 | 78 | return result; | |
| 79 | 79 | } | |
| 80 | 80 | ||
@@ -83,7 +83,7 @@ napi_value createTypeError(napi_env env, napi_callback_info info) { | |||
| 83 | 83 | napi_value message; | |
| 84 | 84 | NAPI_CALL(env, napi_create_string_utf8( | |
| 85 | 85 | env, "type error", NAPI_AUTO_LENGTH, &message)); | |
| 86 | - NAPI_CALL(env, napi_create_type_error(env, nullptr, message, &result)); | ||
| 86 | + NAPI_CALL(env, napi_create_type_error(env, NULL, message, &result)); | ||
| 87 | 87 | return result; | |
| 88 | 88 | } | |
| 89 | 89 | ||
0 commit comments