Sync OpenBSD patchset 188:

Get rid of empty mode_key_free function.
This commit is contained in:
Tiago Cunha 2009-07-28 22:49:26 +00:00
parent 46cb0de347
commit 1880b83c37
7 changed files with 7 additions and 23 deletions

View File

@ -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> * 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; mdata->flags = flags;
} }
void
mode_key_free(unused struct mode_key_data *mdata)
{
}
enum mode_key_cmd enum mode_key_cmd
mode_key_lookup(struct mode_key_data *mdata, int key) mode_key_lookup(struct mode_key_data *mdata, int key)
{ {

View File

@ -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> * 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) if (c->prompt_freefn != NULL && c->prompt_data != NULL)
c->prompt_freefn(c->prompt_data); c->prompt_freefn(c->prompt_data);
mode_key_free(&c->prompt_mdata);
xfree(c->prompt_string); xfree(c->prompt_string);
c->prompt_string = NULL; c->prompt_string = NULL;

3
tmux.h
View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1032,7 +1032,6 @@ int load_cfg(const char *, char **x);
/* mode-key.c */ /* mode-key.c */
void mode_key_init(struct mode_key_data *, int, int); 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); enum mode_key_cmd mode_key_lookup(struct mode_key_data *, int);
/* options.c */ /* options.c */

View File

@ -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> * 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) if (data->freefn != NULL && data->data != NULL)
data->freefn(data->data); data->freefn(data->data);
mode_key_free(&data->mdata);
for (i = 0; i < ARRAY_LENGTH(&data->list); i++) for (i = 0; i < ARRAY_LENGTH(&data->list); i++)
xfree(ARRAY_ITEM(&data->list, i).name); xfree(ARRAY_ITEM(&data->list, i).name);
ARRAY_FREE(&data->list); ARRAY_FREE(&data->list);

View File

@ -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> * 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; struct window_copy_mode_data *data = wp->modedata;
mode_key_free(&data->mdata);
screen_free(&data->screen); screen_free(&data->screen);
xfree(data); xfree(data);
} }

View File

@ -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> * 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; struct window_more_mode_data *data = wp->modedata;
u_int i; u_int i;
mode_key_free(&data->mdata);
for (i = 0; i < ARRAY_LENGTH(&data->list); i++) for (i = 0; i < ARRAY_LENGTH(&data->list); i++)
xfree(ARRAY_ITEM(&data->list, i)); xfree(ARRAY_ITEM(&data->list, i));
ARRAY_FREE(&data->list); ARRAY_FREE(&data->list);

View File

@ -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> * 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; struct window_scroll_mode_data *data = wp->modedata;
mode_key_free(&data->mdata);
screen_free(&data->screen); screen_free(&data->screen);
xfree(data); xfree(data);
} }