mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-29 15:26:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use g_strlcat

Browse source 
It has a sane API.

Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
This commit is contained in:
Sebastian Ramacher 2015-11-12 22:28:46 +01:00
parent 43244a67d2
commit 599e61ccf1
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
zathura/database-sqlite.c
View file

@ -251,24 +251,19 @@ sqlite_db_init(ZathuraSQLDatabase* db, const char* path)
girara_debug("old database table layout detected; updating ..."); girara_debug("old database table layout detected; updating ...");
/* prepare transaction */ /* prepare transaction */
char tx_begin[] = "BEGIN TRANSACTION;" static const char tx_begin[] =
"BEGIN TRANSACTION;"
"ALTER TABLE fileinfo RENAME TO tmp;"; "ALTER TABLE fileinfo RENAME TO tmp;";
char tx_end[] = "INSERT INTO fileinfo SELECT * FROM tmp;" static const char tx_end[] =
"INSERT INTO fileinfo SELECT * FROM tmp;"
"DROP TABLE tmp;" "DROP TABLE tmp;"
"COMMIT;"; "COMMIT;";
/* calculate requred buffer size */
size_t tx_buffer_size = strlen(tx_begin);
tx_buffer_size += strlen(SQL_FILEINFO_INIT);
tx_buffer_size += strlen(tx_end);
++tx_buffer_size;
/* assemble transaction */ /* assemble transaction */
char transaction[tx_buffer_size]; char transaction[sizeof(tx_begin) + sizeof(SQL_FILEINFO_INIT) + sizeof(tx_end) - 2] = { '\0' };
bzero(transaction, tx_buffer_size); g_strlcat(transaction, tx_begin, sizeof(transaction));
strcat(transaction, tx_begin); g_strlcat(transaction, SQL_FILEINFO_INIT, sizeof(transaction));
strcat(transaction, SQL_FILEINFO_INIT); g_strlcat(transaction, tx_end, sizeof(transaction));
strcat(transaction, tx_end);
if (sqlite3_exec(session, transaction, NULL, 0, NULL) != SQLITE_OK) { if (sqlite3_exec(session, transaction, NULL, 0, NULL) != SQLITE_OK) {
girara_warning("failed to update database table layout"); girara_warning("failed to update database table layout");