summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2017-06-07 15:27:46 +0000
committernicm <nicm@openbsd.org>2017-06-07 15:27:46 +0000
commit0cf33a8d5ad40849e421f1981fba4650d86853ef (patch)
treea83728c7262319e78dec28b9d3290119734803a7
parentvmd: Implement simulated baudrate support in the ns8250 module. The (diff)
downloadwireguard-openbsd-0cf33a8d5ad40849e421f1981fba4650d86853ef.tar.xz
wireguard-openbsd-0cf33a8d5ad40849e421f1981fba4650d86853ef.zip
Return 1 if name matches not 0, also fix some spaces.
-rw-r--r--usr.bin/tmux/mode-tree.c4
-rw-r--r--usr.bin/tmux/proc.c4
-rw-r--r--usr.bin/tmux/tmux.h6
-rw-r--r--usr.bin/tmux/window-buffer.c4
4 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/tmux/mode-tree.c b/usr.bin/tmux/mode-tree.c
index d7e09571897..49a123daff3 100644
--- a/usr.bin/tmux/mode-tree.c
+++ b/usr.bin/tmux/mode-tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mode-tree.c,v 1.3 2017/06/07 14:37:30 nicm Exp $ */
+/* $OpenBSD: mode-tree.c,v 1.4 2017/06/07 15:27:46 nicm Exp $ */
/*
* Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -595,7 +595,7 @@ mode_tree_search_for(struct mode_tree_data *mtd)
continue;
}
if (mtd->searchcb(mtd->modedata, mti->itemdata, mtd->ss))
- return (mti);
+ return (mti);
}
return (NULL);
}
diff --git a/usr.bin/tmux/proc.c b/usr.bin/tmux/proc.c
index 56eb2116e98..99a363009d2 100644
--- a/usr.bin/tmux/proc.c
+++ b/usr.bin/tmux/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.9 2017/06/04 08:25:57 nicm Exp $ */
+/* $OpenBSD: proc.c,v 1.10 2017/06/07 15:27:46 nicm Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -47,7 +47,7 @@ struct tmuxpeer {
#define PEER_BAD 0x1
void (*dispatchcb)(struct imsg *, void *);
- void *arg;
+ void *arg;
};
static int peer_check_version(struct tmuxpeer *, struct imsg *);
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 96cbf39c0bd..346fefe3876 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.782 2017/06/07 14:37:30 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.783 2017/06/07 15:27:46 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -617,7 +617,7 @@ struct job {
job_free_cb freecb;
void *data;
- LIST_ENTRY(job) entry;
+ LIST_ENTRY(job) entry;
};
LIST_HEAD(joblist, job);
@@ -676,7 +676,7 @@ struct screen_write_ctx {
struct screen_write_collect_item *item;
struct screen_write_collect_line *list;
u_int scrolled;
- u_int bg;
+ u_int bg;
u_int cells;
u_int written;
diff --git a/usr.bin/tmux/window-buffer.c b/usr.bin/tmux/window-buffer.c
index 9ef3ea86106..df1d7a85f8d 100644
--- a/usr.bin/tmux/window-buffer.c
+++ b/usr.bin/tmux/window-buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-buffer.c,v 1.4 2017/06/07 14:37:30 nicm Exp $ */
+/* $OpenBSD: window-buffer.c,v 1.5 2017/06/07 15:27:46 nicm Exp $ */
/*
* Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -238,7 +238,7 @@ window_buffer_search(__unused void *modedata, void *itemdata, const char *ss)
if ((pb = paste_get_name(item->name)) == NULL)
return (0);
if (strstr(item->name, ss) != NULL)
- return (0);
+ return (1);
bufdata = paste_buffer_data(pb, &bufsize);
return (memmem(bufdata, bufsize, ss, strlen(ss)) != NULL);
}