}
assert(rd->style.nul_mode == OOP_RD_NUL_DISCARD);
for (notnul= nul+1;
- notnul < buf+thisrecsz && notnul == '\0';
+ notnul < buf+thisrecsz && *notnul == '\0';
notnul++);
thisrecsz-= (notnul-nul);
checked= nul-buf;
default:
abort();
}
- fprintf(f," #%03d %-11s l=%d %s\n", i, dinfo, iv->iov_len,
+ fprintf(f," #%03d %-11s l=%zd %s\n", i, dinfo, iv->iov_len,
sanitise(iv->iov_base, iv->iov_len));
free(dinfo);
}
#define CHK(field, val) \
if (h->cmsg_##field != val) { \
- crash("connect: child sent cmsg with cmsg_" #field "=%d, expected %d", \
- h->cmsg_##field, val); \
+ crash("connect: child sent cmsg with cmsg_" #field "=%ld, expected %ld", \
+ (long)h->cmsg_##field, (long)val); \
goto x; \
}
CHK(level, SOL_SOCKET);
+innduct (2.1~~iwj1) unstable; urgency=medium
+
+ * Fix many bugs and compiler warnings.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 07 Jul 2022 11:24:20 +0100
+
innduct (2.0~~iwj) unstable; urgency=medium
* Version 2.0 (builds against libinn2 1.5.4, has Debian build system).
} else if (!path_cli[0] || !strcmp(path_cli,"none")) {
path_cli= 0; /* ok, don't then */
} else if (path_ends_slash(path_cli)) {
- path_cli_dir= masprintf("%.*s", strlen(path_cli)-1, path_cli);
+ path_cli_dir= masprintf("%.*s", (int)(strlen(path_cli)-1), path_cli);
}
if (path_cli_dir)
path_cli= masprintf("%s/%s", path_cli_dir, sitename);
void dbg(const char *fmt, ...) PRINTF(1,2);
void logv(int sysloglevel, const char *pfx, int errnoval,
- const char *fmt, va_list al) PRINTF(5,0);
+ const char *fmt, va_list al) PRINTF(4,0);
char *mvasprintf(const char *fmt, va_list al) PRINTF(1,0);
char *masprintf(const char *fmt, ...) PRINTF(1,2);
INNLOGSET(debug, "debug", LOG_DEBUG)
#define INNLOGSET_DECLARE(fn, pfx, sysloglevel) \
void duct_log_##fn(int l, const char *fmt, va_list al, int errval) \
- PRINTF(3,0);
+ PRINTF(2,0);
INNLOGSETS(INNLOGSET_DECLARE)
/*----- duct.c -----*/
dbg("startup: ductdefer ENOENT");
} else {
dbg("startup: ductdefer nlink=%ld", (long)stabdefer.st_nlink);
- switch (stabdefer.st_nlink==1) {
+ switch (stabdefer.st_nlink) {
case 1:
open_defer(); /* so that we will later close it and rename it */
break;
" (presumably hardlink to backlog file)");
break;
default:
- crash("defer file %s has unexpected link count %d",
- path_defer, stabdefer.st_nlink);
+ crash("defer file %s has unexpected link count %ld",
+ path_defer, (long)stabdefer.st_nlink);
}
}
static int signal_self_pipe[2];
static void *sigarrived_event(oop_source *lp, int fd, oop_event e, void *u) {
- assert(fd=signal_self_pipe[0]);
+ assert(fd==signal_self_pipe[0]);
char buf[PIPE_BUF];
int r= read(signal_self_pipe[0], buf, sizeof(buf));
if (r<0 && !isewouldblock(errno))