Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 258518 | Differences between
and this patch

Collapse All | Expand All

(-)gksql_firebird.cxx.old (-8 / +8 lines)
Lines 370-376 Link Here
370
			char errormsg[512];
370
			char errormsg[512];
371
			if (errcode == -999) {
371
			if (errcode == -999) {
372
				errcode = status[1];
372
				errcode = status[1];
373
				long *pvector = status;
373
				ISC_STATUS *pvector = status;
374
				// TODO: replace all isc_interprete() with fb_interpret()
374
				// TODO: replace all isc_interprete() with fb_interpret()
375
				errormsg[isc_interprete(errormsg, &pvector)] = 0;
375
				errormsg[isc_interprete(errormsg, &pvector)] = 0;
376
			} else {
376
			} else {
Lines 417-423 Link Here
417
			char errormsg[512];
417
			char errormsg[512];
418
			if (errcode == -999) {
418
			if (errcode == -999) {
419
				errcode = status[1];
419
				errcode = status[1];
420
				long *pvector = status;
420
				ISC_STATUS *pvector = status;
421
				errormsg[isc_interprete(errormsg, &pvector)] = 0;
421
				errormsg[isc_interprete(errormsg, &pvector)] = 0;
422
			} else {
422
			} else {
423
				strcpy(errormsg, "SQL:");
423
				strcpy(errormsg, "SQL:");
Lines 497-503 Link Here
497
	
497
	
498
	isc_attach_database(status, 0, const_cast<char*>(dbname.c_str()), &conn, dpb_offset, &(dpb[0]));
498
	isc_attach_database(status, 0, const_cast<char*>(dbname.c_str()), &conn, dpb_offset, &(dpb[0]));
499
	if (status[0] == 1 && status[1] != 0) {
499
	if (status[0] == 1 && status[1] != 0) {
500
		long *pvector = status;
500
		ISC_STATUS *pvector = status;
501
		char errormsg[512];
501
		char errormsg[512];
502
		errormsg[isc_interprete(errormsg, &pvector)] = 0;
502
		errormsg[isc_interprete(errormsg, &pvector)] = 0;
503
		PTRACE(2, GetName() << "\tFirebird connection to " << m_username << '@' << dbname 
503
		PTRACE(2, GetName() << "\tFirebird connection to " << m_username << '@' << dbname 
Lines 530-536 Link Here
530
	
530
	
531
	isc_start_transaction(status, &tr, 1, &conn, 0, NULL);
531
	isc_start_transaction(status, &tr, 1, &conn, 0, NULL);
532
	if (status[0] == 1 && status[1] != 0) {
532
	if (status[0] == 1 && status[1] != 0) {
533
		long *pvector = status;
533
		ISC_STATUS *pvector = status;
534
		char errormsg[512];
534
		char errormsg[512];
535
		errormsg[isc_interprete(errormsg, &pvector)] = 0;
535
		errormsg[isc_interprete(errormsg, &pvector)] = 0;
536
		return new GkIBSQLResult(status[1], errormsg);
536
		return new GkIBSQLResult(status[1], errormsg);
Lines 541-547 Link Here
541
		long errorcode = isc_sqlcode(status);
541
		long errorcode = isc_sqlcode(status);
542
		if (errorcode == -999) {
542
		if (errorcode == -999) {
543
			errorcode = status[1];
543
			errorcode = status[1];
544
			long *pvector = status;
544
			ISC_STATUS *pvector = status;
545
			errormsg[isc_interprete(errormsg, &pvector)] = 0;
545
			errormsg[isc_interprete(errormsg, &pvector)] = 0;
546
		} else {
546
		} else {
547
			strcpy(errormsg, "SQL:");
547
			strcpy(errormsg, "SQL:");
Lines 562-568 Link Here
562
		long errorcode = isc_sqlcode(status);
562
		long errorcode = isc_sqlcode(status);
563
		if (errorcode == -999) {
563
		if (errorcode == -999) {
564
			errorcode = status[1];
564
			errorcode = status[1];
565
			long *pvector = status;
565
			ISC_STATUS *pvector = status;
566
			errormsg[isc_interprete(errormsg, &pvector)] = 0;
566
			errormsg[isc_interprete(errormsg, &pvector)] = 0;
567
		} else {
567
		} else {
568
			strcpy(errormsg, "SQL:");
568
			strcpy(errormsg, "SQL:");
Lines 585-591 Link Here
585
			long errorcode = isc_sqlcode(status);
585
			long errorcode = isc_sqlcode(status);
586
			if (errorcode == -999) {
586
			if (errorcode == -999) {
587
				errorcode = status[1];
587
				errorcode = status[1];
588
				long *pvector = status;
588
				ISC_STATUS *pvector = status;
589
				errormsg[isc_interprete(errormsg, &pvector)] = 0;
589
				errormsg[isc_interprete(errormsg, &pvector)] = 0;
590
			} else {
590
			} else {
591
				strcpy(errormsg, "SQL:");
591
				strcpy(errormsg, "SQL:");
Lines 603-609 Link Here
603
		long errorcode = isc_sqlcode(status);
603
		long errorcode = isc_sqlcode(status);
604
		if (errorcode == -999) {
604
		if (errorcode == -999) {
605
			errorcode = status[1];
605
			errorcode = status[1];
606
			long *pvector = status;
606
			ISC_STATUS *pvector = status;
607
			errormsg[isc_interprete(errormsg, &pvector)] = 0;
607
			errormsg[isc_interprete(errormsg, &pvector)] = 0;
608
		} else {
608
		} else {
609
			strcpy(errormsg, "SQL:");
609
			strcpy(errormsg, "SQL:");

Return to bug 258518