pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-05 04:53:13 +02:00
Code Activity

Get rid of various warnings/errors due to recent work.

Browse Source
This commit is contained in:
Bram Matthys
2021-05-16 16:57:01 +02:00
parent 14a99d755e
commit 5c8752dfc6
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf.c
+1
View File
@@ -10332,6 +10332,7 @@ int _test_secret(ConfigFile *conf, ConfigEntry *ce)
config_error("%s:%i: secret block needs a name, eg: secret xyz {",
ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
errors++;
return errors; /* need to return here since we dereference ce->ce_vardata later.. */
} else {
if (!security_group_valid_name(ce->ce_vardata))
{
src/modules/history_backend_mem.c
+11 -9
View File
@@ -286,9 +286,9 @@ int hbm_config_posttest(int *errs)
/* Ensure directory exists and is writable */
#ifdef _WIN32
mkdir(test.directory); /* (errors ignored) */
(void)mkdir(test.directory); /* (errors ignored) */
#else
mkdir(test.directory, S_IRUSR|S_IWUSR|S_IXUSR); /* (errors ignored) */
(void)mkdir(test.directory, S_IRUSR|S_IWUSR|S_IXUSR); /* (errors ignored) */
#endif
if (!file_exists(test.directory))
{
@@ -700,6 +700,9 @@ static int hbm_write_masterdb(void)
uint32_t mdb_version;
char buf[512];
if (!test.db_secret)
abort();
db = unrealdb_open(test.masterdb, UNREALDB_MODE_WRITE, test.db_secret);
if (!db)
{
@@ -776,13 +779,13 @@ static void hbm_read_dbs(void)
char buf2[512];
snprintf(buf2, sizeof(buf2), "%s/bad", cfg.directory);
#ifdef _WIN32
mkdir(buf2); /* (errors ignored) */
(void)mkdir(buf2); /* (errors ignored) */
#else
mkdir(buf2, S_IRUSR|S_IWUSR|S_IXUSR); /* (errors ignored) */
(void)mkdir(buf2, S_IRUSR|S_IWUSR|S_IXUSR); /* (errors ignored) */
#endif
snprintf(buf2, sizeof(buf2), "%s/bad/%s", cfg.directory, fname);
unlink(buf2);
rename(buf, buf2);
(void)rename(buf, buf2);
}
}
@@ -1012,6 +1015,9 @@ static int hbm_write_db(HistoryLogObject *h)
MessageTag *m;
Channel *channel;
if (!cfg.db_secret)
abort();
channel = find_channel(h->name, NULL);
if (!channel || !has_channel_mode(channel, 'P'))
return 1; /* Don't save this channel, pretend success */
@@ -1019,10 +1025,6 @@ static int hbm_write_db(HistoryLogObject *h)
realfname = hbm_history_filename(h);
snprintf(tmpfname, sizeof(tmpfname), "%s.tmp", realfname);
#ifdef DEBUGMODE
ircd_log(LOG_ERROR, "Writing to: %s...", tmpfname);
#endif
db = unrealdb_open(tmpfname, UNREALDB_MODE_WRITE, cfg.db_secret);
if (!db)
{