aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scripts/config2help.c4
-rw-r--r--scripts/mkflags.c2
-rw-r--r--scripts/mktags.c2
-rw-r--r--toys.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/scripts/config2help.c b/scripts/config2help.c
index be53547d..edb1caea 100644
--- a/scripts/config2help.c
+++ b/scripts/config2help.c
@@ -19,7 +19,7 @@
#include <poll.h>
#include <sys/socket.h>
-/****************** functions copied from lib/*.c ********************/
+//****************** functions copied from lib/*.c ********************
struct double_list {
struct double_list *next, *prev;
@@ -107,7 +107,7 @@ struct double_list *dlist_add(struct double_list **list, char *data)
return new;
}
-/****************** end copies of lib/*.c *************/
+//****************** end copies of lib/*.c *************
// Parse config files into data structures.
diff --git a/scripts/mkflags.c b/scripts/mkflags.c
index b28ae1e1..93294884 100644
--- a/scripts/mkflags.c
+++ b/scripts/mkflags.c
@@ -64,7 +64,7 @@ char *mark_gaps(char *flags, char *all)
if (bare) bare = chrtype(c);
if (*flags == c) {
*(new++) = c;
- *flags++;
+ flags++;
continue;
}
diff --git a/scripts/mktags.c b/scripts/mktags.c
index 9c23cf17..05494b2a 100644
--- a/scripts/mktags.c
+++ b/scripts/mktags.c
@@ -14,7 +14,7 @@ int main(int argc, char *argv[])
char *line = 0, *s;
ssize_t len;
- len = getline(&line, &len, stdin);
+ len = getline(&line, (void *)&len, stdin);
if (len<0) break;
while (len && isspace(line[len-1])) line[--len]=0;
diff --git a/toys.h b/toys.h
index 4083725a..df37b55e 100644
--- a/toys.h
+++ b/toys.h
@@ -108,7 +108,7 @@ extern struct toy_context {
char wasroot; // dropped setuid
// This is at the end so toy_init() doesn't zero it.
- jmp_buf *rebound; // longjmp here instead of exit when do_rebound set
+ sigjmp_buf *rebound; // longjmp here instead of exit when do_rebound set
struct arg_list *xexit; // atexit() functions for xexit(), set by sigatexit()
void *stacktop; // nested toy_exec() call count, or 0 if vforked
} toys;