Skip to content

Commit d543bed

Browse files
committed
Fix GCC 13 -Wmaybe-uninitialized
1 parent fcb61b5 commit d543bed

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

libmariadb/mariadb_lib.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2044,7 +2044,7 @@ void my_set_error(MYSQL *mysql,
20442044
{
20452045
va_list ap;
20462046

2047-
const char *errmsg;
2047+
const char *errmsg= format;
20482048

20492049
mysql->net.last_errno= error_nr;
20502050
ma_strmake(mysql->net.sqlstate, sqlstate, SQLSTATE_LENGTH);
@@ -2061,8 +2061,7 @@ void my_set_error(MYSQL *mysql,
20612061
}
20622062

20632063
va_start(ap, format);
2064-
vsnprintf(mysql->net.last_error, MYSQL_ERRMSG_SIZE - 1,
2065-
format ? format : errmsg, ap);
2064+
vsnprintf(mysql->net.last_error, MYSQL_ERRMSG_SIZE - 1, errmsg, ap);
20662065
va_end(ap);
20672066
return;
20682067
}

libmariadb/mariadb_stmt.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void stmt_set_error(MYSQL_STMT *stmt,
9090
{
9191
va_list ap;
9292

93-
const char *errmsg;
93+
const char *errmsg= format;
9494

9595
stmt->last_errno= error_nr;
9696
ma_strmake(stmt->sqlstate, sqlstate, SQLSTATE_LENGTH);
@@ -116,8 +116,7 @@ void stmt_set_error(MYSQL_STMT *stmt,
116116
}
117117

118118
va_start(ap, format);
119-
vsnprintf(stmt->last_error, MYSQL_ERRMSG_SIZE - 1,
120-
format ? format : errmsg, ap);
119+
vsnprintf(stmt->last_error, MYSQL_ERRMSG_SIZE - 1, errmsg, ap);
121120
va_end(ap);
122121
return;
123122
}

0 commit comments

Comments
 (0)