Compare commits
1 Commits
merge-impr
...
97fd81b60b
| Author | SHA1 | Date | |
|---|---|---|---|
|
97fd81b60b
|
@@ -232,6 +232,10 @@ _sqlite_init(ProfAccount* account)
|
||||
auto_sqlite char* init_version_query = sqlite3_mprintf(
|
||||
"INSERT INTO `DbVersion` (`version`) VALUES (%d) ON CONFLICT(`version`) DO NOTHING",
|
||||
latest_version);
|
||||
if (!init_version_query) {
|
||||
log_error("OOM allocating initial DbVersion insert query");
|
||||
goto out;
|
||||
}
|
||||
if (SQLITE_OK != sqlite3_exec(g_chatlog_database, init_version_query, NULL, 0, &err_msg)) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
@@ -348,10 +348,11 @@ log_stderr_init(log_level_t level)
|
||||
goto err_free;
|
||||
}
|
||||
|
||||
int dup_fd = dup2(stderr_pipe[1], STDERR_FILENO);
|
||||
if (dup_fd < 0)
|
||||
if (dup2(stderr_pipe[1], STDERR_FILENO) < 0)
|
||||
goto err_free;
|
||||
close(dup_fd);
|
||||
// fd 2 now owns the pipe write end; release the original.
|
||||
close(stderr_pipe[1]);
|
||||
stderr_pipe[1] = STDERR_FILENO;
|
||||
|
||||
stderr_level = level;
|
||||
stderr_inited = 1;
|
||||
|
||||
@@ -9,14 +9,11 @@
|
||||
* SPDX-License-Identifier: GPL-3.0-or-later WITH OpenSSL-exception
|
||||
*/
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <glib.h>
|
||||
#include <errno.h>
|
||||
#include <stdio.h> // necessary for readline
|
||||
#include <readline/readline.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
#include <pthread.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include "config/files.h"
|
||||
|
||||
@@ -217,7 +217,7 @@ jid_destroy(Jid* jid)
|
||||
g_free(jid->resourcepart);
|
||||
g_free(jid->barejid);
|
||||
g_free(jid->fulljid);
|
||||
free(jid);
|
||||
g_free(jid);
|
||||
}
|
||||
|
||||
gboolean
|
||||
|
||||
Reference in New Issue
Block a user