Skip to content

Commit 0857d68

Browse files
cjbjcjbj
committed
Remove unused parameter from macro NJS_SET_EXCEPTION
1 parent a1f8b16 commit 0857d68

File tree

6 files changed

+63
-63
lines changed

6 files changed

+63
-63
lines changed

‎src/njs/src/njsConnection.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ void Connection::connectionPropertyException(Connection* njsConn,
192192
msg = NJSMessages::getErrorMsg(errInvalidConnection);
193193
else
194194
msg = NJSMessages::getErrorMsg(errType, property.c_str());
195-
NJS_SET_EXCEPTION(msg.c_str(), (int) msg.length());
195+
NJS_SET_EXCEPTION ( msg.c_str() );
196196
}
197197

198198
/*****************************************************************************/
@@ -207,7 +207,7 @@ NAN_GETTER(Connection::GetStmtCacheSize)
207207
if(!njsConn->isValid_)
208208
{
209209
string error = NJSMessages::getErrorMsg ( errInvalidConnection );
210-
NJS_SET_EXCEPTION(error.c_str(), error.length());
210+
NJS_SET_EXCEPTION ( error.c_str() );
211211
info.GetReturnValue().SetUndefined();
212212
return;
213213
}
@@ -219,7 +219,7 @@ NAN_GETTER(Connection::GetStmtCacheSize)
219219
catch(dpi::Exception &e)
220220
{
221221
NJS_SET_CONN_ERR_STATUS ( e.errnum(), njsConn->dpiconn_ );
222-
NJS_SET_EXCEPTION(e.what(), strlen(e.what()));
222+
NJS_SET_EXCEPTION ( e.what() );
223223
}
224224
info.GetReturnValue().Set(Nan::Undefined());
225225
}
@@ -262,7 +262,7 @@ NAN_SETTER(Connection::SetClientId)
262262
if(!njsConn->isValid_)
263263
{
264264
string msg = NJSMessages::getErrorMsg(errInvalidConnection);
265-
NJS_SET_EXCEPTION(msg.c_str(), (int) msg.length());
265+
NJS_SET_EXCEPTION ( msg.c_str() );
266266
return;
267267
}
268268
else
@@ -276,7 +276,7 @@ NAN_SETTER(Connection::SetClientId)
276276
catch(dpi::Exception &e)
277277
{
278278
NJS_SET_CONN_ERR_STATUS ( e.errnum(), njsConn->dpiconn_ );
279-
NJS_SET_EXCEPTION(e.what(), strlen(e.what()));
279+
NJS_SET_EXCEPTION ( e.what() );
280280
}
281281
}
282282
}
@@ -304,7 +304,7 @@ NAN_SETTER(Connection::SetModule)
304304
if(!njsConn->isValid_)
305305
{
306306
string msg = NJSMessages::getErrorMsg(errInvalidConnection);
307-
NJS_SET_EXCEPTION(msg.c_str(), (int) msg.length());
307+
NJS_SET_EXCEPTION ( msg.c_str() );
308308
return;
309309
}
310310
else
@@ -318,7 +318,7 @@ NAN_SETTER(Connection::SetModule)
318318
catch(dpi::Exception &e)
319319
{
320320
NJS_SET_CONN_ERR_STATUS ( e.errnum(), njsConn->dpiconn_ );
321-
NJS_SET_EXCEPTION(e.what(), strlen(e.what()));
321+
NJS_SET_EXCEPTION ( e.what() );
322322
}
323323
}
324324
}
@@ -346,7 +346,7 @@ NAN_SETTER(Connection::SetAction)
346346
if(!njsConn->isValid_)
347347
{
348348
string msg = NJSMessages::getErrorMsg(errInvalidConnection);
349-
NJS_SET_EXCEPTION(msg.c_str(), (int) msg.length());
349+
NJS_SET_EXCEPTION ( msg.c_str() );
350350
return;
351351
}
352352
else
@@ -360,7 +360,7 @@ NAN_SETTER(Connection::SetAction)
360360
catch(dpi::Exception &e)
361361
{
362362
NJS_SET_CONN_ERR_STATUS ( e.errnum(), njsConn->dpiconn_ );
363-
NJS_SET_EXCEPTION(e.what(), strlen(e.what()));
363+
NJS_SET_EXCEPTION ( e.what() );
364364
}
365365
}
366366
}
@@ -377,7 +377,7 @@ NAN_GETTER (Connection::GetOracleServerVersion)
377377
if ( !njsConn->isValid_ )
378378
{
379379
string error = NJSMessages::getErrorMsg ( errInvalidConnection );
380-
NJS_SET_EXCEPTION(error.c_str(), error.length() );
380+
NJS_SET_EXCEPTION ( error.c_str() );
381381
info.GetReturnValue().SetUndefined();
382382
}
383383

@@ -406,7 +406,7 @@ NAN_GETTER (Connection::GetOracleServerVersion)
406406
catch ( dpi::Exception &e)
407407
{
408408
NJS_SET_CONN_ERR_STATUS ( e.errnum(), njsConn->dpiconn_ );
409-
NJS_SET_EXCEPTION ( e.what(), strlen (e.what () ) );
409+
NJS_SET_EXCEPTION ( e.what() );
410410
info.GetReturnValue().SetUndefined();
411411
}
412412
}
@@ -507,7 +507,7 @@ NAN_METHOD(Connection::Execute)
507507
delete executeBaton;
508508
string error = NJSMessages::getErrorMsg ( errInternalError,
509509
"uv_queue_work", "Execute" );
510-
NJS_SET_EXCEPTION(error.c_str(), error.length());
510+
NJS_SET_EXCEPTION ( error.c_str() );
511511
}
512512

513513
info.GetReturnValue().SetUndefined();
@@ -3593,7 +3593,7 @@ NAN_METHOD(Connection::Release)
35933593
delete releaseBaton;
35943594
string error = NJSMessages::getErrorMsg ( errInternalError,
35953595
"uv_queue_work", "Release" );
3596-
NJS_SET_EXCEPTION(error.c_str(), error.length());
3596+
NJS_SET_EXCEPTION ( error.c_str() );
35973597
}
35983598
info.GetReturnValue().SetUndefined();
35993599
scope.Escape ( Nan::Undefined () );
@@ -3708,7 +3708,7 @@ NAN_METHOD(Connection::Commit)
37083708
delete commitBaton;
37093709
string error = NJSMessages::getErrorMsg ( errInternalError,
37103710
"uv_queue_work", "Commit" );
3711-
NJS_SET_EXCEPTION(error.c_str(), error.length());
3711+
NJS_SET_EXCEPTION ( error.c_str() );
37123712
}
37133713

37143714
info.GetReturnValue().SetUndefined();
@@ -3815,7 +3815,7 @@ NAN_METHOD(Connection::Rollback)
38153815
delete rollbackBaton;
38163816
string error = NJSMessages::getErrorMsg ( errInternalError,
38173817
"uv_queue_work", "Rollback" );
3818-
NJS_SET_EXCEPTION(error.c_str(), error.length());
3818+
NJS_SET_EXCEPTION ( error.c_str() );
38193819
}
38203820
info.GetReturnValue().SetUndefined();
38213821
}
@@ -3923,7 +3923,7 @@ NAN_METHOD(Connection::Break)
39233923
delete breakBaton;
39243924
string error = NJSMessages::getErrorMsg ( errInternalError,
39253925
"uv_queue_work", "Break" );
3926-
NJS_SET_EXCEPTION(error.c_str(), error.length());
3926+
NJS_SET_EXCEPTION ( error.c_str() );
39273927
}
39283928

39293929
info.GetReturnValue().SetUndefined();

‎src/njs/src/njsIntLob.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ NAN_METHOD(ILob::Release)
366366
if( !iLob->njsconn_->isValid() )
367367
{
368368
msg = NJSMessages::getErrorMsg ( errInvalidConnection );
369-
NJS_SET_EXCEPTION( msg.c_str(), (int) msg.length() );
369+
NJS_SET_EXCEPTION ( msg.c_str() );
370370
info.GetReturnValue().SetUndefined();
371371
return;
372372
}
@@ -411,7 +411,7 @@ void ILob::lobPropertyException(ILob *iLob,
411411
else
412412
msg = NJSMessages::getErrorMsg(errInvalidLob);
413413

414-
NJS_SET_EXCEPTION(msg.c_str(), (int)msg.length());
414+
NJS_SET_EXCEPTION ( msg.c_str() );
415415
}
416416

417417

@@ -440,7 +440,7 @@ NAN_GETTER(ILob::GetChunkSize)
440440
if( !iLob->njsconn_->isValid() )
441441
{
442442
msg = NJSMessages::getErrorMsg ( errInvalidConnection );
443-
NJS_SET_EXCEPTION( msg.c_str(), (int) msg.length() );
443+
NJS_SET_EXCEPTION ( msg.c_str() );
444444
info.GetReturnValue().SetUndefined();
445445
return;
446446
}
@@ -453,7 +453,7 @@ NAN_GETTER(ILob::GetChunkSize)
453453
catch(dpi::Exception &e)
454454
{
455455
NJS_SET_CONN_ERR_STATUS ( e.errnum(), iLob->dpiconn_ );
456-
NJS_SET_EXCEPTION(e.what(), strlen(e.what()));
456+
NJS_SET_EXCEPTION ( e.what() );
457457
}
458458

459459
info.GetReturnValue().SetUndefined();
@@ -510,7 +510,7 @@ NAN_GETTER(ILob::GetLength)
510510
if( !iLob->njsconn_->isValid() )
511511
{
512512
msg = NJSMessages::getErrorMsg ( errInvalidConnection );
513-
NJS_SET_EXCEPTION( msg.c_str(), (int) msg.length() );
513+
NJS_SET_EXCEPTION ( msg.c_str() );
514514
info.GetReturnValue().SetUndefined();
515515
return;
516516
}
@@ -523,7 +523,7 @@ NAN_GETTER(ILob::GetLength)
523523
catch(dpi::Exception &e)
524524
{
525525
NJS_SET_CONN_ERR_STATUS ( e.errnum(), iLob->dpiconn_ );
526-
NJS_SET_EXCEPTION(e.what(), strlen(e.what()));
526+
NJS_SET_EXCEPTION ( e.what() );
527527
}
528528

529529
info.GetReturnValue().SetUndefined();
@@ -579,7 +579,7 @@ NAN_GETTER(ILob::GetPieceSize)
579579
if( !iLob->njsconn_->isValid() )
580580
{
581581
msg = NJSMessages::getErrorMsg ( errInvalidConnection );
582-
NJS_SET_EXCEPTION( msg.c_str(), (int) msg.length() );
582+
NJS_SET_EXCEPTION ( msg.c_str() );
583583
info.GetReturnValue().SetUndefined();
584584
return;
585585
}
@@ -592,7 +592,7 @@ NAN_GETTER(ILob::GetPieceSize)
592592
catch(dpi::Exception &e)
593593
{
594594
NJS_SET_CONN_ERR_STATUS ( e.errnum(), iLob->dpiconn_ );
595-
NJS_SET_EXCEPTION(e.what(), strlen(e.what()));
595+
NJS_SET_EXCEPTION ( e.what() );
596596
}
597597

598598
info.GetReturnValue().SetUndefined();
@@ -626,14 +626,14 @@ NAN_SETTER(ILob::SetPieceSize)
626626
{
627627
msg = NJSMessages::getErrorMsg(errBusyLob);
628628

629-
NJS_SET_EXCEPTION(msg.c_str(), (int)msg.length());
629+
NJS_SET_EXCEPTION ( msg.c_str() );
630630
return;
631631
}
632632

633633
if( !iLob->njsconn_->isValid() )
634634
{
635635
msg = NJSMessages::getErrorMsg ( errInvalidConnection );
636-
NJS_SET_EXCEPTION( msg.c_str(), (int) msg.length() );
636+
NJS_SET_EXCEPTION ( msg.c_str() );
637637
return;
638638
}
639639

@@ -654,7 +654,7 @@ NAN_SETTER(ILob::SetPieceSize)
654654
catch(dpi::Exception &e)
655655
{
656656
NJS_SET_CONN_ERR_STATUS ( e.errnum(), iLob->dpiconn_ );
657-
NJS_SET_EXCEPTION(e.what(), strlen(e.what()));
657+
NJS_SET_EXCEPTION ( e.what() );
658658
}
659659
}
660660
else
@@ -687,7 +687,7 @@ NAN_GETTER(ILob::GetOffset)
687687
if( !iLob->njsconn_->isValid() )
688688
{
689689
msg = NJSMessages::getErrorMsg ( errInvalidConnection );
690-
NJS_SET_EXCEPTION( msg.c_str(), (int) msg.length() );
690+
NJS_SET_EXCEPTION ( msg.c_str() );
691691
info.GetReturnValue().SetUndefined();
692692
return;
693693
}
@@ -700,7 +700,7 @@ NAN_GETTER(ILob::GetOffset)
700700
catch(dpi::Exception &e)
701701
{
702702
NJS_SET_CONN_ERR_STATUS ( e.errnum(), iLob->dpiconn_ );
703-
NJS_SET_EXCEPTION(e.what(), strlen(e.what()));
703+
NJS_SET_EXCEPTION ( e.what() );
704704
}
705705

706706
info.GetReturnValue().SetUndefined();
@@ -735,21 +735,21 @@ NAN_SETTER(ILob::SetOffset)
735735
{
736736
string msg = NJSMessages::getErrorMsg(errInvalidPropertyValue, "offset");
737737

738-
NJS_SET_EXCEPTION(msg.c_str(), (int)msg.length());
738+
NJS_SET_EXCEPTION ( msg.c_str() );
739739
}
740740

741741
if (iLob->state_ == NJS_ACTIVE)
742742
{
743743
msg = NJSMessages::getErrorMsg(errBusyLob);
744744

745-
NJS_SET_EXCEPTION(msg.c_str(), (int)msg.length());
745+
NJS_SET_EXCEPTION ( msg.c_str() );
746746
return;
747747
}
748748

749749
if( !iLob->njsconn_->isValid() )
750750
{
751751
msg = NJSMessages::getErrorMsg ( errInvalidConnection );
752-
NJS_SET_EXCEPTION( msg.c_str(), (int) msg.length() );
752+
NJS_SET_EXCEPTION ( msg.c_str() );
753753
return;
754754
}
755755

@@ -786,7 +786,7 @@ NAN_GETTER(ILob::GetType)
786786

787787
catch(dpi::Exception &e)
788788
{
789-
NJS_SET_EXCEPTION(e.what(), strlen(e.what()));
789+
NJS_SET_EXCEPTION ( e.what() );
790790
}
791791

792792
info.GetReturnValue().SetUndefined();
@@ -879,7 +879,7 @@ NAN_METHOD(ILob::Read)
879879
delete lobBaton;
880880
string error = NJSMessages::getErrorMsg ( errInternalError,
881881
"uv_queue_work", "LobRead" );
882-
NJS_SET_EXCEPTION(error.c_str(), error.length());
882+
NJS_SET_EXCEPTION ( error.c_str() );
883883
}
884884

885885
info.GetReturnValue().SetUndefined();
@@ -1083,7 +1083,7 @@ NAN_METHOD(ILob::Write)
10831083
delete lobBaton;
10841084
string error = NJSMessages::getErrorMsg ( errInternalError,
10851085
"uv_queue_work", "LobWrite" );
1086-
NJS_SET_EXCEPTION(error.c_str(), error.length());
1086+
NJS_SET_EXCEPTION ( error.c_str() );
10871087
}
10881088

10891089
info.GetReturnValue().SetUndefined();

‎src/njs/src/njsOracle.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ NAN_SETTER(Oracledb::SetMaxRows)
392392
if ( tempMaxRows <= 0 )
393393
{
394394
string errMsg = NJSMessages::getErrorMsg ( errInvalidmaxRows );
395-
NJS_SET_EXCEPTION( errMsg.c_str(), errMsg.length() );
395+
NJS_SET_EXCEPTION ( errMsg.c_str() );
396396
}
397397
else
398398
{
@@ -541,7 +541,7 @@ NAN_SETTER(Oracledb::SetVersion)
541541
{
542542
std::string msg;
543543
msg = NJSMessages::getErrorMsg(errReadOnly, "version");
544-
NJS_SET_EXCEPTION(msg.c_str(), (int) msg.length());
544+
NJS_SET_EXCEPTION ( msg.c_str() );
545545
}
546546

547547

@@ -666,7 +666,7 @@ NAN_SETTER(Oracledb::SetFetchAsString)
666666
if ( !value->IsArray () )
667667
{
668668
msg = NJSMessages::getErrorMsg ( errEmptyArrayForFetchAs );
669-
NJS_SET_EXCEPTION(msg.c_str(), (int) msg.length () );
669+
NJS_SET_EXCEPTION ( msg.c_str() );
670670
}
671671

672672
array = value.As<v8::Array> ();
@@ -698,7 +698,7 @@ NAN_SETTER(Oracledb::SetFetchAsString)
698698
if ( !oracledb->fetchAsStringTypes_ )
699699
{
700700
msg = NJSMessages::getErrorMsg ( errInsufficientMemory ) ;
701-
NJS_SET_EXCEPTION ( msg.c_str (), (int) msg.length () );
701+
NJS_SET_EXCEPTION ( msg.c_str () );
702702
}
703703

704704
for ( unsigned int t = 0 ; t < array->Length () ; t ++ )
@@ -708,7 +708,7 @@ NAN_SETTER(Oracledb::SetFetchAsString)
708708
if ( ( type == NJS_DATATYPE_STR ) || ( type == NJS_DATATYPE_DEFAULT ) )
709709
{
710710
msg = NJSMessages::getErrorMsg ( errInvalidTypeForConversion );
711-
NJS_SET_EXCEPTION(msg.c_str(), (int)msg.length () );
711+
NJS_SET_EXCEPTION ( msg.c_str() );
712712
}
713713
oracledb->fetchAsStringTypes_[t] = type;
714714
}
@@ -738,7 +738,7 @@ NAN_SETTER(Oracledb::SetOracleClientVersion )
738738
{
739739
std::string msg;
740740
msg = NJSMessages::getErrorMsg (errReadOnly, "oracleClientVersion");
741-
NJS_SET_EXCEPTION(msg.c_str(), (int) msg.length());
741+
NJS_SET_EXCEPTION ( msg.c_str() );
742742
}
743743

744744

@@ -805,7 +805,7 @@ exitGetConnection :
805805
string error = NJSMessages::getErrorMsg ( errInternalError,
806806
"uv_queue_work",
807807
"GetConnection" );
808-
NJS_SET_EXCEPTION(error.c_str(), error.length());
808+
NJS_SET_EXCEPTION ( error.c_str() );
809809
}
810810
info.GetReturnValue().SetUndefined();
811811
}
@@ -964,7 +964,7 @@ NAN_METHOD(Oracledb::CreatePool)
964964
delete poolBaton;
965965
string error = NJSMessages::getErrorMsg ( errInternalError,
966966
"uv_queue_work", "CreatePool" );
967-
NJS_SET_EXCEPTION(error.c_str(), error.length());
967+
NJS_SET_EXCEPTION ( error.c_str() );
968968
}
969969

970970
info.GetReturnValue().SetUndefined();

0 commit comments

Comments
 (0)