← Back to branch summary

~ubuntu-branches/ubuntu/vivid/grass/vivid-proposed

« back to all changes in this revision

Viewing changes to db/drivers/odbc/describe.c

  • Committer: Package Import Robot
  • Author(s): Bas Couwenberg
  • Date: 2015-02-20 23:12:08 UTC
  • mfrom: (8.2.6 experimental)
  • Revision ID: package-import@ubuntu.com-20150220231208-1u6qvqm84v430b10
Tags: 7.0.0-1~exp1
* New upstream release.
* Update python-ctypes-ternary.patch to use if/else instead of and/or.
* Drop check4dev patch, rely on upstream check.
* Add build dependency on libpq-dev to grass-dev for libpq-fe.h.
* Drop patches applied upstream, refresh remaining patches.
* Update symlinks for images switched from jpg to png.

Show diffs side-by-side

added added

removed removed

Lines of Context:
db/drivers/odbc/describe.c
17
17
    cursor *c;
18
18
    char s[100];
19
19
    char msg[OD_MSG];
20
 
    char *emsg;
21
20
 
22
21
    /* allocate cursor */
23
22
    c = alloc_cursor();
34
33
    if ((ret != SQL_SUCCESS) && (ret != SQL_SUCCESS_WITH_INFO)) {
35
34
        SQLGetDiagRec(SQL_HANDLE_STMT, c->stmt, 1, NULL, &err, msg,
36
35
                      sizeof(msg), NULL);
37
 
        G_asprintf(&emsg, "SQLExecDirect():\n%s\n%s (%d)\n", s, msg,
38
 
                   (int)err);
39
 
        report_error(emsg);
 
36
        db_d_append_error("SQLExecDirect():\n%s\n%s (%d)\n", s, msg,
 
37
                          (int)err);
 
38
        db_d_report_error();
40
39
        return DB_FAILED;
41
40
    }
42
41
 
75
74
    /* get the number of colummns */
76
75
    ret = SQLNumResultCols(stmt, &ncols);
77
76
    if ((ret != SQL_SUCCESS) && (ret != SQL_SUCCESS_WITH_INFO)) {
78
 
        report_error("SQLNumResultCols()");
 
77
        db_d_append_error("SQLNumResultCols()");
 
78
        db_d_report_error();
79
79
        return DB_FAILED;
80
80
    }
81
81