@@ -143,11 +143,11 @@ class RefCounter
143
143
*/
144
144
#define NJS_GET_CALLBACK ( cb, args ) \
145
145
{ \
146
- string msg; \
146
+ string errMsg; \
147
147
if ( !args.Length () || !args[(args.Length ()-1 )]->IsFunction () ) \
148
148
{ \
149
- msg = NJSMessages::getErrorMsg ( errMissingCallback ); \
150
- NJS_SET_EXCEPTION ( msg .c_str (), msg .length () ); \
149
+ errMsg = NJSMessages::getErrorMsg ( errMissingCallback ); \
150
+ NJS_SET_EXCEPTION ( errMsg .c_str (), errMsg .length () ); \
151
151
args.GetReturnValue ().SetUndefined (); \
152
152
return ; \
153
153
} \
@@ -319,16 +319,16 @@ class RefCounter
319
319
*/
320
320
#define NJS_SET_PROP_STR ( val, v8value, prop ) \
321
321
{ \
322
- string msg; \
322
+ string errMsg; \
323
323
if ( v8value->IsString () ) \
324
324
{ \
325
325
NJSString ( val, v8value ); \
326
326
} \
327
327
else \
328
328
{ \
329
- msg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
329
+ errMsg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
330
330
prop ); \
331
- NJS_SET_EXCEPTION ( msg .c_str (), msg .length () ); \
331
+ NJS_SET_EXCEPTION ( errMsg .c_str (), errMsg .length () ); \
332
332
} \
333
333
}
334
334
@@ -339,16 +339,16 @@ class RefCounter
339
339
*/
340
340
#define NJS_SET_PROP_UINT ( val, v8value, prop ) \
341
341
{ \
342
- string msg; \
342
+ string errMsg; \
343
343
if ( v8value->IsUint32 () ) \
344
344
{ \
345
345
val = v8value->ToUint32 ()->Value (); \
346
346
} \
347
347
else \
348
348
{ \
349
- msg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
349
+ errMsg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
350
350
prop ); \
351
- NJS_SET_EXCEPTION ( msg .c_str (), msg .length () ); \
351
+ NJS_SET_EXCEPTION ( errMsg .c_str (), errMsg .length () ); \
352
352
} \
353
353
}
354
354
@@ -360,16 +360,16 @@ class RefCounter
360
360
*/
361
361
#define NJS_SET_PROP_DOUBLE ( val, v8value, prop ) \
362
362
{ \
363
- string msg; \
363
+ string errMsg; \
364
364
if ( v8value->IsNUmber () ) \
365
365
{ \
366
366
val = v8value->ToNumber ()->Value (); \
367
367
} \
368
368
else \
369
369
{ \
370
- msg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
370
+ errMsg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
371
371
prop ); \
372
- NJS_SET_EXCEPTION ( msg .c_str (), msg .length () ); \
372
+ NJS_SET_EXCEPTION ( errMsg .c_str (), errMsg .length () ); \
373
373
} \
374
374
}
375
375
@@ -392,7 +392,7 @@ class RefCounter
392
392
*/
393
393
#define NJS_CHECK_OBJECT_VALID ( p ) \
394
394
{ \
395
- if ( !p ) \
395
+ if ( !p ) \
396
396
{ \
397
397
string error = NJSMessages::getErrorMsg ( errInvalidJSObject ); \
398
398
NJS_SET_EXCEPTION (error.c_str (), error.length ()); \
@@ -407,11 +407,11 @@ class RefCounter
407
407
*/
408
408
#define NJS_CHECK_OBJECT_VALID2 ( p, info ) \
409
409
{ \
410
- if ( !p ) \
410
+ if ( !p ) \
411
411
{ \
412
412
string error = NJSMessages::getErrorMsg ( errInvalidJSObject ); \
413
413
NJS_SET_EXCEPTION (error.c_str (), error.length ()); \
414
- info.GetReturnValue ().SetUndefined () ; \
414
+ info.GetReturnValue ().SetUndefined () ; \
415
415
return ; \
416
416
} \
417
417
}
0 commit comments