← Back to branch summary

~ubuntu-branches/debian/sid/unixodbc/sid

« back to all changes in this revision

Viewing changes to Drivers/Postgre7.1/results.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2004-10-15 03:07:52 UTC
  • mfrom: (2.1.1 warty)
  • Revision ID: james.westby@ubuntu.com-20041015030752-dzw4vhxlgycz3woj
Tags: 2.2.4-11
Brown paper bag me: conflicts do not write themselves just because
you add a line to the changelog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Drivers/Postgre7.1/results.c
33
33
#include <stdio.h>
34
34
 
35
35
#ifndef WIN32
36
 
#include "iodbc.h"
37
36
#include "isqlext.h"
38
37
#else
39
38
#include <windows.h>
283
282
                *pcbColName = len;
284
283
 
285
284
        if (szColName) {
286
 
                strncpy_null(szColName, col_name, cbColNameMax);
 
285
                strncpy_null((char*)szColName, col_name, cbColNameMax);
287
286
 
288
287
                if (len >= cbColNameMax)  {
289
288
                        result = SQL_SUCCESS_WITH_INFO;
1222
1221
                return SQL_INVALID_HANDLE;
1223
1222
        }
1224
1223
 
1225
 
        len = (cbCursor == SQL_NTS) ? strlen(szCursor) : cbCursor;
 
1224
        len = (cbCursor == SQL_NTS) ? strlen((char*)szCursor) : cbCursor;
1226
1225
 
1227
1226
        if (len <= 0 || len > sizeof(stmt->cursor_name) - 1) {
1228
1227
                stmt->errornumber = STMT_INVALID_CURSOR_NAME;
1231
1230
                return SQL_ERROR;
1232
1231
        }
1233
1232
 
1234
 
        strncpy_null(stmt->cursor_name, szCursor, len+1);
 
1233
        strncpy_null((char*)stmt->cursor_name, (char*)szCursor, len+1);
1235
1234
        return SQL_SUCCESS;
1236
1235
}
1237
1236
 
1266
1265
        len = strlen(stmt->cursor_name);
1267
1266
 
1268
1267
        if (szCursor) {
1269
 
                strncpy_null(szCursor, (char*)stmt->cursor_name, cbCursorMax);
 
1268
                strncpy_null((char*)szCursor, (char*)stmt->cursor_name, cbCursorMax);
1270
1269
 
1271
1270
                if (len >= cbCursorMax)  {
1272
1271
                        result = SQL_SUCCESS_WITH_INFO;