Sync OpenBSD patchset 188:

Get rid of empty mode_key_free function.

7 files changed, 7 insertions, 23 deletions

diff --git a/mode-key.c b/mode-key.c
index ecb675df..28a31d98 100644
--- a/mode-key.c
+++ b/mode-key.c
@@ -1,4 +1,4 @@
-/* $Id: mode-key.c,v 1.17 2009-07-28 22:44:38 tcunha Exp $ */
+/* $Id: mode-key.c,v 1.18 2009-07-28 22:49:26 tcunha Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -33,11 +33,6 @@ mode_key_init(struct mode_key_data *mdata, int type, int flags)
 	mdata->flags = flags;
 }
 
-void
-mode_key_free(unused struct mode_key_data *mdata)
-{
-}
-
 enum mode_key_cmd
 mode_key_lookup(struct mode_key_data *mdata, int key)
 {
diff --git a/status.c b/status.c
index 87234ff2..73e604e3 100644
--- a/status.c
+++ b/status.c
@@ -1,4 +1,4 @@
-/* $Id: status.c,v 1.103 2009-07-28 22:44:38 tcunha Exp $ */
+/* $Id: status.c,v 1.104 2009-07-28 22:49:26 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -622,8 +622,6 @@ status_prompt_clear(struct client *c)
 	if (c->prompt_freefn != NULL && c->prompt_data != NULL)
 		c->prompt_freefn(c->prompt_data);
 
-	mode_key_free(&c->prompt_mdata);
-
 	xfree(c->prompt_string);
 	c->prompt_string = NULL;
 
diff --git a/tmux.h b/tmux.h
index a972b40a..00821915 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.392 2009-07-28 22:44:38 tcunha Exp $ */
+/* $Id: tmux.h,v 1.393 2009-07-28 22:49:26 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -1032,7 +1032,6 @@ int		 load_cfg(const char *, char **x);
 
 /* mode-key.c */
 void		 mode_key_init(struct mode_key_data *, int, int);
-void		 mode_key_free(struct mode_key_data *);
 enum mode_key_cmd mode_key_lookup(struct mode_key_data *, int);
 
 /* options.c */
diff --git a/window-choose.c b/window-choose.c
index d27751e0..6a0d447f 100644
--- a/window-choose.c
+++ b/window-choose.c
@@ -1,4 +1,4 @@
-/* $Id: window-choose.c,v 1.17 2009-07-17 12:12:54 nicm Exp $ */
+/* $Id: window-choose.c,v 1.18 2009-07-28 22:49:26 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -140,8 +140,6 @@ window_choose_free(struct window_pane *wp)
 	if (data->freefn != NULL && data->data != NULL)
 		data->freefn(data->data);
 
- 	mode_key_free(&data->mdata);
-
 	for (i = 0; i < ARRAY_LENGTH(&data->list); i++)
 		xfree(ARRAY_ITEM(&data->list, i).name);
 	ARRAY_FREE(&data->list);
diff --git a/window-copy.c b/window-copy.c
index 3ada4503..45551523 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -1,4 +1,4 @@
-/* $Id: window-copy.c,v 1.67 2009-07-28 22:39:29 tcunha Exp $ */
+/* $Id: window-copy.c,v 1.68 2009-07-28 22:49:26 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -125,8 +125,6 @@ window_copy_free(struct window_pane *wp)
 {
 	struct window_copy_mode_data	*data = wp->modedata;
 
- 	mode_key_free(&data->mdata);
-
 	screen_free(&data->screen);
 	xfree(data);
 }
diff --git a/window-more.c b/window-more.c
index 982038ed..14362423 100644
--- a/window-more.c
+++ b/window-more.c
@@ -1,4 +1,4 @@
-/* $Id: window-more.c,v 1.32 2009-06-25 16:21:32 nicm Exp $ */
+/* $Id: window-more.c,v 1.33 2009-07-28 22:49:26 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -101,8 +101,6 @@ window_more_free(struct window_pane *wp)
 	struct window_more_mode_data	*data = wp->modedata;
 	u_int				 i;
 
-	mode_key_free(&data->mdata);
-
 	for (i = 0; i < ARRAY_LENGTH(&data->list); i++)
 		xfree(ARRAY_ITEM(&data->list, i));
 	ARRAY_FREE(&data->list);
diff --git a/window-scroll.c b/window-scroll.c
index d7c537dc..c5eeba70 100644
--- a/window-scroll.c
+++ b/window-scroll.c
@@ -1,4 +1,4 @@
-/* $Id: window-scroll.c,v 1.33 2009-05-04 17:58:27 nicm Exp $ */
+/* $Id: window-scroll.c,v 1.34 2009-07-28 22:49:26 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -88,8 +88,6 @@ window_scroll_free(struct window_pane *wp)
 {
 	struct window_scroll_mode_data	*data = wp->modedata;
 
-	mode_key_free(&data->mdata);
-
 	screen_free(&data->screen);
 	xfree(data);
 }