aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2016-10-17 19:25:45 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2016-10-17 19:25:45 +0100
commitf6c49cecc18df02579473095818935e8271fbfbc (patch)
treec41787de20debca17f2676be2704146d68205cca
parent7ba845297fd60c784ecff248b27db109750211bf (diff)
downloadrtmux-f6c49cecc18df02579473095818935e8271fbfbc.tar.gz
rtmux-f6c49cecc18df02579473095818935e8271fbfbc.tar.bz2
rtmux-f6c49cecc18df02579473095818935e8271fbfbc.zip
One extra empty line not in OpenBSD, and tweak a #define style.
-rw-r--r--proc.c1
-rw-r--r--tools/cmp-cvs.sh2
-rw-r--r--xmalloc.h2
3 files changed, 2 insertions, 3 deletions
diff --git a/proc.c b/proc.c
index feac1517..5ed0a517 100644
--- a/proc.c
+++ b/proc.c
@@ -190,7 +190,6 @@ proc_start(const char *name, struct event_base *base, int forkflag,
}
log_open(name);
-
setproctitle("%s (%s)", name, socket_path);
if (uname(&u) < 0)
diff --git a/tools/cmp-cvs.sh b/tools/cmp-cvs.sh
index 5429d769..048ad15c 100644
--- a/tools/cmp-cvs.sh
+++ b/tools/cmp-cvs.sh
@@ -4,7 +4,7 @@ rm diff.out
touch diff.out
for i in *.[ch]; do
- diff -u $i /usr/src/usr.bin/tmux/$i >diff.tmp
+ diff -u -I'\$OpenBSD' $i /usr/src/usr.bin/tmux/$i >diff.tmp
set -- `wc -l diff.tmp`
[ $1 -eq 8 ] && continue
echo $i
diff --git a/xmalloc.h b/xmalloc.h
index 0360b0d9..61f8adef 100644
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -20,7 +20,7 @@
#define XMALLOC_H
#if !defined(__bounded__)
-# define __bounded__(x, y, z)
+#define __bounded__(x, y, z)
#endif
void *xmalloc(size_t);