Browse Source

wrong type for variable; spotted by christian.siebert@cs.tu-chemnitz.de

ok guenther
OPENBSD_5_0
deraadt 13 years ago
parent
commit
563890ecd9
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      src/lib/libc/stdlib/merge.c

+ 3
- 3
src/lib/libc/stdlib/merge.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: merge.c,v 1.8 2005/08/08 08:05:37 espie Exp $ */
/* $OpenBSD: merge.c,v 1.9 2011/03/06 00:55:38 deraadt Exp $ */
/*- /*-
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
@ -248,8 +248,8 @@ void
setup(u_char *list1, u_char *list2, size_t n, size_t size, setup(u_char *list1, u_char *list2, size_t n, size_t size,
int (*cmp)(const void *, const void *)) int (*cmp)(const void *, const void *))
{ {
int i, length, size2, tmp, sense;
u_char *f1, *f2, *s, *l2, *last, *p2;
int i, length, size2, sense;
u_char tmp, *f1, *f2, *s, *l2, *last, *p2;
size2 = size*2; size2 = size*2;
if (n <= 5) { if (n <= 5) {


Loading…
Cancel
Save