Path: blob/main/databases/apq-odbc/files/patch-src_odbc__lib.c
16130 views
--- src/odbc_lib.c.orig 2012-01-10 14:17:05.000000000 -05001+++ src/odbc_lib.c2@@ -1,3 +1,5 @@3+#include <stdlib.h>4+#include <string.h>5#include "odbc_lib.h"678@@ -43,10 +45,10 @@ void login_Information_Set_Up (ODBC_Logi910int get_Login_String_Size (ODBC_Login_Information* login_Information) {1112+ int total_Size = 0;13if (!is_Ready(login_Information))14return(-1);1516- int total_Size = 0;17total_Size += strlen(login_Information->p_Formatted_User_Name);18total_Size += strlen(login_Information->p_Formatted_Password);19total_Size += strlen(login_Information->p_Formatted_Data_Source);20@@ -75,6 +77,7 @@ int print_Login_String (ODBC_Login_Infor21strcat(destiny, login_Information->p_Formatted_User_Name);22strcat(destiny, login_Information->p_Formatted_Password);23strcat(destiny, login_Information->p_Formatted_Data_Source);24+ return(0);25}2627void reset_Login_Information (ODBC_Login_Information* login_Information) {28@@ -241,7 +244,7 @@ void connect_With_Data_Source (ODBC_Faca29+ 1);3031if (SQL_SUCCEEDED(SQLDriverConnect(odbc_Facade->connection_Handle, NULL,32- login_String, SQL_NTS, NULL, 0, NULL,33+ (SQLCHAR*)login_String, SQL_NTS, NULL, 0, NULL,34SQL_DRIVER_NOPROMPT)))35switch_On_Connection(odbc_Facade);3637@@ -273,14 +276,14 @@ ODBC_Query_Results* create_And_Run_SQL_S38//TODO: Return error string instead of printing it?39void p_Print_Error_Information (ODBC_Facade* odbc_Facade) {4041- char ercode[6];42+ SQLCHAR ercode[6];43SQLINTEGER err;44- char error[250];45+ SQLCHAR error[250];46SQLSMALLINT size;4748SQLGetDiagRec(SQL_HANDLE_DBC, odbc_Facade->environment_Handle, 1, ercode,49&err, error, 250, &size);50- printf ("\n%d, %s - %s\n", err, ercode, error);51+ printf ("\n%d, %s - %s\n", (int)err, ercode, error);52}535455@@ -289,4 +292,5 @@ void p_Print_Error_Information (ODBC_Fac56char* alloc_String (int size) {57char* return_Value = malloc(sizeof(char) * size);58*return_Value = '\0';59+ return return_Value;60}616263