← Back to branch summary

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

« back to all changes in this revision

Viewing changes to db/drivers/dbf/cursor.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/dbf/cursor.c
17
17
#include <stdlib.h>
18
18
#include <grass/dbmi.h>
19
19
#include <grass/gis.h>
 
20
#include <grass/glocale.h>
20
21
#include "globals.h"
21
22
#include "proto.h"
22
23
 
43
44
    /* allocate the cursor */
44
45
    c = (cursor *) db_malloc(sizeof(cursor));
45
46
    if (c == NULL) {
46
 
        append_error("cannot alloc new cursor");
 
47
        db_d_append_error(_("Unable to allocate new cursor"));
 
48
        db_d_report_error();
47
49
        return c;
48
50
    }
49
51
 
54
56
    if (c->token < 0) {
55
57
        free_cursor(c);
56
58
        c = NULL;
57
 
        append_error("cannot tokenize new cursor\n");
 
59
        db_d_append_error(_("Unable to tokenize new cursor"));
 
60
        db_d_report_error();
58
61
    }
59
62
 
60
63
    return c;