mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 09:26:05 +00:00 
			
		
		
		
	Sync OpenBSD patchset 153:
Remove a couple of unused functions and fix a type ("FALLTHOUGH"), found by
lint.
			
			
This commit is contained in:
		
							
								
								
									
										16
									
								
								grid.c
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								grid.c
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
			
		||||
/* $Id: grid.c,v 1.27 2009-07-17 12:35:01 nicm Exp $ */
 | 
			
		||||
/* $Id: grid.c,v 1.28 2009-07-22 17:31:20 tcunha Exp $ */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
 | 
			
		||||
@@ -199,20 +199,6 @@ grid_scroll_line(struct grid *gd)
 | 
			
		||||
	gd->hsize++;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* Reduce line to fit to cell. */
 | 
			
		||||
void
 | 
			
		||||
grid_reduce_line(struct grid *gd, u_int py, u_int sx)
 | 
			
		||||
{
 | 
			
		||||
	if (sx < gd->size[py]) {
 | 
			
		||||
		gd->data[py] = xrealloc(gd->data[py], sx, sizeof **gd->data);
 | 
			
		||||
		gd->size[py] = sx;
 | 
			
		||||
	}
 | 
			
		||||
	if (sx < gd->usize[py]) {
 | 
			
		||||
		gd->udata[py] = xrealloc(gd->udata[py], sx, sizeof **gd->udata);
 | 
			
		||||
		gd->usize[py] = sx;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* Expand line to fit to cell. */
 | 
			
		||||
void
 | 
			
		||||
grid_expand_line(struct grid *gd, u_int py, u_int sx)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										15
									
								
								log.c
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								log.c
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
			
		||||
/* $Id: log.c,v 1.15 2009-06-25 16:23:35 nicm Exp $ */
 | 
			
		||||
/* $Id: log.c,v 1.16 2009-07-22 17:31:20 tcunha Exp $ */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 | 
			
		||||
@@ -171,19 +171,6 @@ log_debug2(const char *msg, ...)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* Log a debug message at level 3. */
 | 
			
		||||
void printflike1
 | 
			
		||||
log_debug3(const char *msg, ...)
 | 
			
		||||
{
 | 
			
		||||
	va_list	ap;
 | 
			
		||||
 | 
			
		||||
	if (log_level > 2) {
 | 
			
		||||
		va_start(ap, msg);
 | 
			
		||||
		log_vwrite(LOG_DEBUG, msg, ap);
 | 
			
		||||
		va_end(ap);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* Log a critical error, with error string if necessary, and die. */
 | 
			
		||||
__dead void
 | 
			
		||||
log_vfatal(const char *msg, va_list ap)
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								status.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								status.c
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
			
		||||
/* $Id: status.c,v 1.100 2009-07-20 16:01:07 tcunha Exp $ */
 | 
			
		||||
/* $Id: status.c,v 1.101 2009-07-22 17:31:20 tcunha Exp $ */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 | 
			
		||||
@@ -350,7 +350,7 @@ status_replace(struct session *s, const char *fmt, time_t t)
 | 
			
		||||
						  wl->window->active));
 | 
			
		||||
					ptr = tmp;
 | 
			
		||||
				}
 | 
			
		||||
				/* FALLTHOUGH */
 | 
			
		||||
				/* FALLTHROUGH */
 | 
			
		||||
			case 'S':
 | 
			
		||||
				if (ptr == NULL)
 | 
			
		||||
					ptr = s->name;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								tmux.h
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								tmux.h
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
			
		||||
/* $Id: tmux.h,v 1.377 2009-07-22 16:55:22 tcunha Exp $ */
 | 
			
		||||
/* $Id: tmux.h,v 1.378 2009-07-22 17:31:20 tcunha Exp $ */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 | 
			
		||||
@@ -1348,7 +1348,6 @@ extern const struct grid_cell grid_default_cell;
 | 
			
		||||
struct grid *grid_create(u_int, u_int, u_int);
 | 
			
		||||
void	 grid_destroy(struct grid *);
 | 
			
		||||
int	 grid_compare(struct grid *, struct grid *);
 | 
			
		||||
void	 grid_reduce_line(struct grid *, u_int, u_int);
 | 
			
		||||
void	 grid_expand_line(struct grid *, u_int, u_int);
 | 
			
		||||
void	 grid_expand_line_utf8(struct grid *, u_int, u_int);
 | 
			
		||||
void	 grid_scroll_line(struct grid *);
 | 
			
		||||
@@ -1602,7 +1601,6 @@ void printflike1 log_warnx(const char *, ...);
 | 
			
		||||
void printflike1 log_info(const char *, ...);
 | 
			
		||||
void printflike1 log_debug(const char *, ...);
 | 
			
		||||
void printflike1 log_debug2(const char *, ...);
 | 
			
		||||
void printflike1 log_debug3(const char *, ...);
 | 
			
		||||
__dead void	 log_fatal(const char *, ...);
 | 
			
		||||
__dead void	 log_fatalx(const char *, ...);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user