===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/options.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/tmux/options.c	2009/06/01 22:58:49	1.1
--- src/usr.bin/tmux/options.c	2009/07/21 19:54:22	1.2
***************
*** 1,4 ****
! /* $OpenBSD: options.c,v 1.1 2009/06/01 22:58:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: options.c,v 1.2 2009/07/21 19:54:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 83,102 ****
  	return (o);
  }
  
! int
  options_remove(struct options *oo, const char *name)
  {
  	struct options_entry	*o;
  
  	if ((o = options_find1(oo, name)) == NULL)
! 		return (-1);
  
  	SPLAY_REMOVE(options_tree, &oo->tree, o);
  	xfree(o->name);
  	if (o->type == OPTIONS_STRING)
  		xfree(o->value.string);
  	xfree(o);
- 	return (0);
  }
  
  void printflike3
--- 83,101 ----
  	return (o);
  }
  
! void
  options_remove(struct options *oo, const char *name)
  {
  	struct options_entry	*o;
  
  	if ((o = options_find1(oo, name)) == NULL)
! 		return;
  
  	SPLAY_REMOVE(options_tree, &oo->tree, o);
  	xfree(o->name);
  	if (o->type == OPTIONS_STRING)
  		xfree(o->value.string);
  	xfree(o);
  }
  
  void printflike3