Skip to content

Commit 1e006ca

Browse files
committed
Fix strict-prototypes warnings
1 parent 49a859b commit 1e006ca

5 files changed

Lines changed: 12 additions & 8 deletions

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: RMySQL
2-
Version: 0.10.23
2+
Version: 0.10.24
33
Title: Database Interface and 'MySQL' Driver for R
44
Description: Legacy 'DBI' interface to 'MySQL' / 'MariaDB' based on old code
55
ported from S-PLUS. A modern 'MySQL' client based on 'Rcpp' is available

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Version 0.10.24
2+
3+
* Fix strict-prototypes warnings
4+
15
# Version 0.10.23
26

37
* Windows: update to mariadb-connector-c 3.2.5. This new version still uses OpenSSL for R <= 4.1 but R 4.2 (ucrt) it switches to the new native Windows schannel TLS.

src/RS-MySQL.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ typedef struct MySQLDriver {
101101

102102
// Driver ----------------------------------------------------------------------
103103

104-
MySQLDriver* rmysql_driver();
104+
MySQLDriver* rmysql_driver(void);
105105
SEXP rmysql_driver_init(SEXP max_con_, SEXP fetch_default_rec_);
106-
SEXP rmysql_driver_info();
106+
SEXP rmysql_driver_info(void);
107107

108108
SEXP rmysql_exception_info(SEXP conHandle);
109109

src/driver.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#include "RS-MySQL.h"
22

33
static MySQLDriver* dbManager = NULL;
4-
MySQLDriver* rmysql_driver() {
4+
MySQLDriver* rmysql_driver(void) {
55
if (!dbManager) error("Corrupt MySQL handle");
66
return dbManager;
77
}
88

9-
SEXP rmysql_driver_valid() {
9+
SEXP rmysql_driver_valid(void) {
1010
if(!dbManager || !dbManager->connections) {
1111
return ScalarLogical(FALSE);
1212
} else {
@@ -56,7 +56,7 @@ SEXP rmysql_driver_init(SEXP max_con_, SEXP fetch_default_rec_) {
5656
return mgrHandle;
5757
}
5858

59-
SEXP rmysql_driver_close() {
59+
SEXP rmysql_driver_close(void) {
6060
MySQLDriver *mgr = rmysql_driver();
6161

6262
if(mgr->num_con)
@@ -75,7 +75,7 @@ SEXP rmysql_driver_close() {
7575
return ScalarLogical(TRUE);
7676
}
7777

78-
SEXP rmysql_driver_info() {
78+
SEXP rmysql_driver_info(void) {
7979
MySQLDriver *mgr = rmysql_driver();
8080

8181
// Allocate output

src/utils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ SEXP rmysql_escape_strings(SEXP conHandle, SEXP strings) {
258258
return output;
259259
}
260260

261-
SEXP rmysql_version() {
261+
SEXP rmysql_version(void) {
262262
SEXP output = PROTECT(allocVector(INTSXP, 2));
263263
SEXP output_nms = PROTECT(allocVector(STRSXP, 2));
264264
SET_NAMES(output, output_nms);

0 commit comments

Comments
 (0)