From patchwork Wed Jul 27 09:17:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 107014 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3FE29B6F68 for ; Wed, 27 Jul 2011 19:51:41 +1000 (EST) Received: from localhost ([::1]:50306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm0Fl-0007Hb-FU for incoming@patchwork.ozlabs.org; Wed, 27 Jul 2011 05:18:09 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm0FQ-0007CM-2r for qemu-devel@nongnu.org; Wed, 27 Jul 2011 05:17:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qm0FN-00080K-CD for qemu-devel@nongnu.org; Wed, 27 Jul 2011 05:17:48 -0400 Received: from mtagate7.uk.ibm.com ([194.196.100.167]:58485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm0FN-00080C-4y for qemu-devel@nongnu.org; Wed, 27 Jul 2011 05:17:45 -0400 Received: from d06nrmr1507.portsmouth.uk.ibm.com (d06nrmr1507.portsmouth.uk.ibm.com [9.149.38.233]) by mtagate7.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p6R9Hi0X023680 for ; Wed, 27 Jul 2011 09:17:44 GMT Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p6R9Hino2302076 for ; Wed, 27 Jul 2011 10:17:44 +0100 Received: from d06av11.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p6R9Hg8q030654 for ; Wed, 27 Jul 2011 03:17:43 -0600 Received: from stefanha-thinkpad.ibm.com (sig-9-145-216-11.de.ibm.com [9.145.216.11]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p6R9HaB9030380; Wed, 27 Jul 2011 03:17:42 -0600 From: Stefan Hajnoczi To: Date: Wed, 27 Jul 2011 10:17:28 +0100 Message-Id: <1311758252-10072-4-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1311758252-10072-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1311758252-10072-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.167 Cc: Anthony Liguori , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 3/7] slirp: Fix unusual "comments" in unused code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Stefan Weil cppcheck detected two rather strange comments which were not correctly written as C comments. They did not cause any harm because they were framed by #ifdef notdef ... #endif, so they were never compiled. Fix them nevertheless (we could also remove the unused code). Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- slirp/ip_input.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slirp/ip_input.c b/slirp/ip_input.c index 5e67631..c7b3eb4 100644 --- a/slirp/ip_input.c +++ b/slirp/ip_input.c @@ -511,7 +511,7 @@ typedef uint32_t n_time; */ break; } - off--; / * 0 origin * / + off--; /* 0 origin */ if (off > optlen - sizeof(struct in_addr)) { /* * End of source route. Should be for us. @@ -554,7 +554,7 @@ typedef uint32_t n_time; /* * If no space remains, ignore. */ - off--; * 0 origin * + off--; /* 0 origin */ if (off > optlen - sizeof(struct in_addr)) break; bcopy((caddr_t)(&ip->ip_dst), (caddr_t)&ipaddr.sin_addr,