← Back to branch summary

~ubuntu-branches/ubuntu/wily/grass/wily

« back to all changes in this revision

Viewing changes to db/drivers/mysql/parse.c

Tags: 7.0.0~rc1+ds1-1~exp1
http://bugs.debian.org/776349
* New upstream release candidate.
* Repack upstream tarball, remove precompiled Python objects.
* Add upstream metadata.
* Update gbp.conf and Vcs-Git URL to use the experimental branch.
* Update watch file for GRASS 7.0.
* Drop build dependencies for Tcl/Tk, add build dependencies:
  python-numpy, libnetcdf-dev, netcdf-bin, libblas-dev, liblapack-dev
* Update Vcs-Browser URL to use cgit instead of gitweb.
* Update paths to use grass70.
* Add configure options: --with-netcdf, --with-blas, --with-lapack,
  remove --with-tcltk-includes.
* Update patches for GRASS 7.
* Update copyright file, changes:
  - Update copyright years
  - Group files by license
  - Remove unused license sections
* Add patches for various typos.
* Fix desktop file with patch instead of d/rules.
* Use minimal dh rules.
* Bump Standards-Version to 3.9.6, no changes.
* Use dpkg-maintscript-helper to replace directories with symlinks.
  (closes: #776349)
* Update my email to use @debian.org address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
db/drivers/mysql/parse.c
26
26
 *  \return DB_OK Success
27
27
 *  \return DB_FAILED Failed to parse database
28
28
 */
29
 
int parse_conn(char *str, CONNPAR * conn)
 
29
int parse_conn(const char *str, CONNPAR * conn)
30
30
{
31
31
    int i;
32
32
    char **tokens, delm[2];
57
57
                long port = atol(tokens[i] + 5);
58
58
 
59
59
                if (port <= 0) {
60
 
                    append_error(_("Wrong port number in MySQL database "
61
 
                                   "definition: "));
62
 
                    append_error(tokens[i] + 5);
 
60
                    db_d_append_error("%s %s",
 
61
                                      _("Wrong port number in MySQL database "
 
62
                                        "definition: "),
 
63
                                      tokens[i] + 5);
63
64
                    return DB_FAILED;
64
65
                }
65
66
                conn->port = (unsigned int)port;
76
77
                            "is not supported, use db.login"));
77
78
            }
78
79
            else {
79
 
                append_error(_("Unknown option in database definition for "));
80
 
                append_error("MySQL: ");
81
 
                append_error(tokens[i]);
 
80
                db_d_append_error("%s %s",
 
81
                                  _("Unknown option in database definition "
 
82
                                    "for MySQL: "),
 
83
                                  tokens[i]);
82
84
                return DB_FAILED;
83
85
            }
84
86
            i++;