From 8df24066ebdd56141d4c67afc1648fd04dd94af3 Mon Sep 17 00:00:00 2001 From: Mohan Yelugoti Date: Wed, 11 Sep 2024 23:04:02 -0400 Subject: [PATCH 1/3] lib/db: remove deprecated implementation of db_set_login() In a similar vein to #4302, remove deprecated implementation of db_set_login() and replace it with that of db_set_login2(). Along with db_get_login(), db_set_login() was deprecated (in favour of db_set_login2) in 2015 with the 7.8.0 release. Commit: da399c5 Signed-off-by: Mohan Yelugoti --- db/db.login/main.c | 6 +++--- include/grass/defs/dbmi.h | 5 ++--- lib/db/dbmi_base/login.c | 27 +++------------------------ 3 files changed, 8 insertions(+), 30 deletions(-) diff --git a/db/db.login/main.c b/db/db.login/main.c index 9147c0e7f1f..f073b654665 100644 --- a/db/db.login/main.c +++ b/db/db.login/main.c @@ -98,9 +98,9 @@ int main(int argc, char *argv[]) exit(EXIT_SUCCESS); } - if (db_set_login2(driver->answer, database->answer, user->answer, - password->answer, host->answer, port->answer, - G_get_overwrite()) == DB_FAILED) { + if (db_set_login(driver->answer, database->answer, user->answer, + password->answer, host->answer, port->answer, + G_get_overwrite()) == DB_FAILED) { G_fatal_error(_("Unable to set user/password")); } diff --git a/include/grass/defs/dbmi.h b/include/grass/defs/dbmi.h index c5bf648414f..325a1e06bc7 100644 --- a/include/grass/defs/dbmi.h +++ b/include/grass/defs/dbmi.h @@ -386,9 +386,8 @@ const char *db_whoami(void); void db_zero(void *, int); void db_zero_string(dbString *); unsigned int db_sizeof_string(const dbString *); -int db_set_login(const char *, const char *, const char *, const char *); -int db_set_login2(const char *, const char *, const char *, const char *, - const char *, const char *, int); +int db_set_login(const char *, const char *, const char *, const char *, + const char *, const char *, int); int db_get_login(const char *, const char *, const char **, const char **); int db_get_login2(const char *, const char *, const char **, const char **, const char **, const char **); diff --git a/lib/db/dbmi_base/login.c b/lib/db/dbmi_base/login.c index d79fc84e6cf..c73833ad285 100644 --- a/lib/db/dbmi_base/login.c +++ b/lib/db/dbmi_base/login.c @@ -250,27 +250,6 @@ static int set_login(const char *driver, const char *database, const char *user, return DB_OK; } -/*! - \brief Set login parameters for driver/database - - \deprecated Use db_set_login2() instead. - - \todo: GRASS 8: to be replaced by db_set_login2(). - - \param driver driver name - \param database database name - \param user user name - \param password password string - - \return DB_OK on success - \return DB_FAILED on failure - */ -int db_set_login(const char *driver, const char *database, const char *user, - const char *password) -{ - return set_login(driver, database, user, password, NULL, NULL, FALSE); -} - /*! \brief Set login parameters for driver/database @@ -285,9 +264,9 @@ int db_set_login(const char *driver, const char *database, const char *user, \return DB_OK on success \return DB_FAILED on failure */ -int db_set_login2(const char *driver, const char *database, const char *user, - const char *password, const char *host, const char *port, - int overwrite) +int db_set_login(const char *driver, const char *database, const char *user, + const char *password, const char *host, const char *port, + int overwrite) { return set_login(driver, database, user, password, host, port, overwrite); } From ac763c5f12d7d366c4dc8fe19332c5dc36222db9 Mon Sep 17 00:00:00 2001 From: Mohan Yelugoti Date: Fri, 13 Sep 2024 21:11:29 -0400 Subject: [PATCH 2/3] lib/db: remove deprecated implementation of db_set_login() db_set_login() is deprecated in 7.8.0 release with da399c5. Change its function signature and implementation to match that of currently preferred db_set_login2(). Modify db_set_login2() to internally call db_set_login() function call. In the future major version, db_set_login() would be removed to have only one method to set login details for simplicity. Signed-off-by: Mohan Yelugoti --- include/grass/defs/dbmi.h | 2 ++ lib/db/dbmi_base/login.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/include/grass/defs/dbmi.h b/include/grass/defs/dbmi.h index 325a1e06bc7..e57968116ae 100644 --- a/include/grass/defs/dbmi.h +++ b/include/grass/defs/dbmi.h @@ -388,6 +388,8 @@ void db_zero_string(dbString *); unsigned int db_sizeof_string(const dbString *); int db_set_login(const char *, const char *, const char *, const char *, const char *, const char *, int); +int db_set_login2(const char *, const char *, const char *, const char *, + const char *, const char *, int); int db_get_login(const char *, const char *, const char **, const char **); int db_get_login2(const char *, const char *, const char **, const char **, const char **, const char **); diff --git a/lib/db/dbmi_base/login.c b/lib/db/dbmi_base/login.c index c73833ad285..6161d3972d7 100644 --- a/lib/db/dbmi_base/login.c +++ b/lib/db/dbmi_base/login.c @@ -250,6 +250,27 @@ static int set_login(const char *driver, const char *database, const char *user, return DB_OK; } +/*! + \brief Set login parameters for driver/database + + \param driver driver name + \param database database name + \param user user name + \param password password string + \param host host name + \param port + \param overwrite TRUE to overwrite existing connections + + \return DB_OK on success + \return DB_FAILED on failure + */ +int db_set_login2(const char *driver, const char *database, const char *user, + const char *password, const char *host, const char *port, + int overwrite) +{ + return db_set_login(driver, database, user, password, host, port, overwrite); +} + /*! \brief Set login parameters for driver/database From ba0897c7e4a668bc694c1b7dace6a03cb33d112d Mon Sep 17 00:00:00 2001 From: Mohan Yelugoti Date: Fri, 13 Sep 2024 21:15:50 -0400 Subject: [PATCH 3/3] Update lib/db/dbmi_base/login.c Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- lib/db/dbmi_base/login.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/db/dbmi_base/login.c b/lib/db/dbmi_base/login.c index 6161d3972d7..f4a21071836 100644 --- a/lib/db/dbmi_base/login.c +++ b/lib/db/dbmi_base/login.c @@ -268,7 +268,8 @@ int db_set_login2(const char *driver, const char *database, const char *user, const char *password, const char *host, const char *port, int overwrite) { - return db_set_login(driver, database, user, password, host, port, overwrite); + return db_set_login(driver, database, user, password, host, port, + overwrite); } /*!