lukechilds
/
node
mirror of https://github.com/lukechilds/node.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

src: fix runtime/references cpplint warnings 

PR-URL: https://github.com/nodejs/node/pull/7462
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
v4.x
Ben Noordhuis 9 years ago
committed by Myles Borins
parent
f530a36c65
commit
44cbe0356d
2 changed files with 34 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/node_contextify.cc
  2. 53
      tools/icu/iculslocs.cc

14
src/node_contextify.cc
View File

@ -516,7 +516,7 @@ class ContextifyScript : public BaseObject {
// Do the eval within this context // Do the eval within this context
Environment* env = Environment::GetCurrent(args); Environment* env = Environment::GetCurrent(args);
EvalMachine(env, timeout, display_errors, args, try_catch); EvalMachine(env, timeout, display_errors, args, &try_catch);
} }
// args: sandbox, [options] // args: sandbox, [options]
@ -563,7 +563,7 @@ class ContextifyScript : public BaseObject {
timeout, timeout,
display_errors, display_errors,
args, args,
try_catch)) { &try_catch)) {
contextify_context->CopyProperties(); contextify_context->CopyProperties();
} }
@ -683,7 +683,7 @@ class ContextifyScript : public BaseObject {
const int64_t timeout, const int64_t timeout,
const bool display_errors, const bool display_errors,
const FunctionCallbackInfo<Value>& args, const FunctionCallbackInfo<Value>& args,
TryCatch& try_catch) { TryCatch* try_catch) {
if (!ContextifyScript::InstanceOf(env, args.Holder())) { if (!ContextifyScript::InstanceOf(env, args.Holder())) {
env->ThrowTypeError( env->ThrowTypeError(
"Script methods can only be called on script instances."); "Script methods can only be called on script instances.");
@ -703,19 +703,19 @@ class ContextifyScript : public BaseObject {
result = script->Run(); result = script->Run();
} }
if (try_catch.HasCaught() && try_catch.HasTerminated()) { if (try_catch->HasCaught() && try_catch->HasTerminated()) {
V8::CancelTerminateExecution(env->isolate()); V8::CancelTerminateExecution(env->isolate());
env->ThrowError("Script execution timed out."); env->ThrowError("Script execution timed out.");
try_catch.ReThrow(); try_catch->ReThrow();
return false; return false;
} }
if (result.IsEmpty()) { if (result.IsEmpty()) {
// Error occurred during execution of the script. // Error occurred during execution of the script.
if (display_errors) { if (display_errors) {
AppendExceptionLine(env, try_catch.Exception(), try_catch.Message()); AppendExceptionLine(env, try_catch->Exception(), try_catch->Message());
} }
try_catch.ReThrow(); try_catch->ReThrow();
return false; return false;
} }

53
tools/icu/iculslocs.cc
View File

@ -105,13 +105,13 @@ void usage() {
PROG); PROG);
} }
#define ASSERT_SUCCESS(what) \ #define ASSERT_SUCCESS(status, what) \
if (U_FAILURE(status)) { \ if (U_FAILURE(*status)) { \
u_printf("%s:%d: %s: ERROR: %s %s\n", \ u_printf("%s:%d: %s: ERROR: %s %s\n", \
__FILE__, \ __FILE__, \
__LINE__, \ __LINE__, \
PROG, \ PROG, \
u_errorName(status), \ u_errorName(*status), \
what); \ what); \
return 1; \ return 1; \
} }
@ -177,9 +177,9 @@ int localeExists(const char* loc, UBool* exists) {
} }
} }
void printIndent(const LocalUFILEPointer& bf, int indent) { void printIndent(const LocalUFILEPointer* bf, int indent) {
for (int i = 0; i < indent + 1; i++) { for (int i = 0; i < indent + 1; i++) {
u_fprintf(bf.getAlias(), " "); u_fprintf(bf->getAlias(), " ");
} }
} }
@ -189,15 +189,15 @@ void printIndent(const LocalUFILEPointer& bf, int indent) {
* @return 0 for OK, 1 for err * @return 0 for OK, 1 for err
*/ */
int dumpAllButInstalledLocales(int lev, int dumpAllButInstalledLocales(int lev,
LocalUResourceBundlePointer& bund, LocalUResourceBundlePointer* bund,
LocalUFILEPointer& bf, LocalUFILEPointer* bf,
UErrorCode& status) { UErrorCode* status) {
ures_resetIterator(bund.getAlias()); ures_resetIterator(bund->getAlias());
const UBool isTable = (UBool)(ures_getType(bund.getAlias()) == URES_TABLE); const UBool isTable = (UBool)(ures_getType(bund->getAlias()) == URES_TABLE);
LocalUResourceBundlePointer t; LocalUResourceBundlePointer t;
while (U_SUCCESS(status) && ures_hasNext(bund.getAlias())) { while (U_SUCCESS(*status) && ures_hasNext(bund->getAlias())) {
t.adoptInstead(ures_getNextResource(bund.getAlias(), t.orphan(), &status)); t.adoptInstead(ures_getNextResource(bund->getAlias(), t.orphan(), status));
ASSERT_SUCCESS("while processing table"); ASSERT_SUCCESS(status, "while processing table");
const char* key = ures_getKey(t.getAlias()); const char* key = ures_getKey(t.getAlias());
if (VERBOSE > 1) { if (VERBOSE > 1) {
u_printf("dump@%d: got key %s\n", lev, key); u_printf("dump@%d: got key %s\n", lev, key);
@ -208,22 +208,22 @@ int dumpAllButInstalledLocales(int lev,
} }
} else { } else {
printIndent(bf, lev); printIndent(bf, lev);
u_fprintf(bf.getAlias(), "%s", key); u_fprintf(bf->getAlias(), "%s", key);
switch (ures_getType(t.getAlias())) { switch (ures_getType(t.getAlias())) {
case URES_STRING: { case URES_STRING: {
int32_t len = 0; int32_t len = 0;
const UChar* s = ures_getString(t.getAlias(), &len, &status); const UChar* s = ures_getString(t.getAlias(), &len, status);
ASSERT_SUCCESS("getting string"); ASSERT_SUCCESS(status, "getting string");
u_fprintf(bf.getAlias(), ":string {\""); u_fprintf(bf->getAlias(), ":string {\"");
u_file_write(s, len, bf.getAlias()); u_file_write(s, len, bf->getAlias());
u_fprintf(bf.getAlias(), "\"}"); u_fprintf(bf->getAlias(), "\"}");
} break; } break;
default: { default: {
u_printf("ERROR: unhandled type in dumpAllButInstalledLocales().\n"); u_printf("ERROR: unhandled type in dumpAllButInstalledLocales().\n");
return 1; return 1;
} break; } break;
} }
u_fprintf(bf.getAlias(), "\n"); u_fprintf(bf->getAlias(), "\n");
} }
} }
return 0; return 0;
@ -250,7 +250,7 @@ int list(const char* toBundle) {
// first, calculate the bundle name. // first, calculate the bundle name.
calculatePackageName(&status); calculatePackageName(&status);
ASSERT_SUCCESS("calculating package name"); ASSERT_SUCCESS(&status, "calculating package name");
if (VERBOSE) { if (VERBOSE) {
u_printf("\"locale\": %s\n", locale); u_printf("\"locale\": %s\n", locale);
@ -258,10 +258,10 @@ int list(const char* toBundle) {
LocalUResourceBundlePointer bund( LocalUResourceBundlePointer bund(
ures_openDirect(packageName.data(), locale, &status)); ures_openDirect(packageName.data(), locale, &status));
ASSERT_SUCCESS("while opening the bundle"); ASSERT_SUCCESS(&status, "while opening the bundle");
LocalUResourceBundlePointer installedLocales( LocalUResourceBundlePointer installedLocales(
ures_getByKey(bund.getAlias(), INSTALLEDLOCALES, NULL, &status)); ures_getByKey(bund.getAlias(), INSTALLEDLOCALES, NULL, &status));
ASSERT_SUCCESS("while fetching installed locales"); ASSERT_SUCCESS(&status, "while fetching installed locales");
int32_t count = ures_getSize(installedLocales.getAlias()); int32_t count = ures_getSize(installedLocales.getAlias());
if (VERBOSE) { if (VERBOSE) {
@ -280,11 +280,12 @@ int list(const char* toBundle) {
"%s:table(nofallback) {\n" "%s:table(nofallback) {\n"
" // First, everything besides InstalledLocales:\n", " // First, everything besides InstalledLocales:\n",
locale); locale);
if (dumpAllButInstalledLocales(0, bund, bf, status)) { if (dumpAllButInstalledLocales(0, &bund, &bf, &status)) {
u_printf("Error dumping prolog for %s\n", toBundle); u_printf("Error dumping prolog for %s\n", toBundle);
return 1; return 1;
} }
ASSERT_SUCCESS("while writing prolog"); // in case an error was missed // in case an error was missed
ASSERT_SUCCESS(&status, "while writing prolog");
u_fprintf(bf.getAlias(), u_fprintf(bf.getAlias(),
" %s:table { // %d locales in input %s.res\n", " %s:table { // %d locales in input %s.res\n",
@ -300,7 +301,7 @@ int list(const char* toBundle) {
for (int32_t i = 0; i < count; i++) { for (int32_t i = 0; i < count; i++) {
subkey.adoptInstead(ures_getByIndex( subkey.adoptInstead(ures_getByIndex(
installedLocales.getAlias(), i, subkey.orphan(), &status)); installedLocales.getAlias(), i, subkey.orphan(), &status));
ASSERT_SUCCESS("while fetching an installed locale's name"); ASSERT_SUCCESS(&status, "while fetching an installed locale's name");
const char* key = ures_getKey(subkey.getAlias()); const char* key = ures_getKey(subkey.getAlias());
if (VERBOSE > 1) { if (VERBOSE > 1) {

Write Preview
Loading…
Cancel
Save