From owner-p4-projects@FreeBSD.ORG Thu May 1 17:57:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF401106566B; Thu, 1 May 2008 17:57:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF0F21065678 for ; Thu, 1 May 2008 17:57:42 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A0558FC2C for ; Thu, 1 May 2008 17:57:42 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m41HvgsN039060 for ; Thu, 1 May 2008 17:57:42 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m41HvgO7039058 for perforce@freebsd.org; Thu, 1 May 2008 17:57:42 GMT (envelope-from gabor@freebsd.org) Date: Thu, 1 May 2008 17:57:42 GMT Message-Id: <200805011757.m41HvgO7039058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 140996 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 May 2008 17:57:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=140996 Change 140996 by gabor@gabor_server on 2008/05/01 17:57:13 - Eliminate some warnings Affected files ... .. //depot/projects/soc2008/gabor_textproc/sort/append.c#3 edit .. //depot/projects/soc2008/gabor_textproc/sort/fields.c#3 edit .. //depot/projects/soc2008/gabor_textproc/sort/files.c#3 edit .. //depot/projects/soc2008/gabor_textproc/sort/msort.c#3 edit .. //depot/projects/soc2008/gabor_textproc/sort/sort.c#4 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/sort/append.c#3 (text+ko) ==== @@ -68,7 +68,7 @@ void (*put)(RECHEADER *, FILE *), struct field *ftbl) { u_char *wts, *wts1; - int n, odepth; + int n, odepth = depth; u_char **cpos, **ppos, **lastkey; u_char *cend, *pend, *start; RECHEADER *crec, *prec; @@ -81,7 +81,6 @@ wts1 = Rascii; else if (ftbl[0].flags & F) wts1 = ascii; - odepth = depth; } lastkey = keylist + nelem; depth += sizeof(TRECHEADER); ==== //depot/projects/soc2008/gabor_textproc/sort/fields.c#3 (text+ko) ==== ==== //depot/projects/soc2008/gabor_textproc/sort/files.c#3 (text+ko) ==== @@ -285,8 +285,8 @@ if (!linebuf) err(2, "realloc of linebuf to %lu bytes failed", (unsigned long)linebuf_size); - end = linebuf + linebuf_size; - pos = linebuf + (pos - buf); + end = (char *) (linebuf + linebuf_size); + pos = (char *) (linebuf + (pos - buf)); line->data = buf = (char *)linebuf; continue; } ==== //depot/projects/soc2008/gabor_textproc/sort/msort.c#3 (text+ko) ==== @@ -256,9 +256,9 @@ err(2, NULL); } crec = (RECHEADER *) buffer; - crec_end = ((char *)crec) + ALIGN(MAXLLEN + sizeof(RECHEADER)); + crec_end = ((u_char *)crec) + ALIGN(MAXLLEN + sizeof(RECHEADER)); prec = (RECHEADER *) crec_end; - prec_end = ((char *)prec) + ALIGN(MAXLLEN + sizeof(RECHEADER)); + prec_end = ((u_char *)prec) + ALIGN(MAXLLEN + sizeof(RECHEADER)); wts = ftbl->weights; if (SINGL_FLD && (ftbl->flags & F)) wts1 = ftbl->flags & R ? Rascii : ascii; ==== //depot/projects/soc2008/gabor_textproc/sort/sort.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #include #ifndef lint -__COPYRIGHT("@(#) Copyright (c) 1993\nThe Regents of the University of California. All rights reserved.\n"); +__COPYRIGHT("@(#) Copyright (c) 1993 The Regents of the University of California. All rights reserved."); #endif /* not lint */ #ifndef lint