From patchwork Thu Jul 21 19:46:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 106142 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 05E83B6F74 for ; Fri, 22 Jul 2011 05:47:00 +1000 (EST) Received: from localhost ([::1]:55011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjzCz-00073P-Gx for incoming@patchwork.ozlabs.org; Thu, 21 Jul 2011 15:46:57 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjzCt-000736-VV for qemu-devel@nongnu.org; Thu, 21 Jul 2011 15:46:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjzCs-0006ou-Ra for qemu-devel@nongnu.org; Thu, 21 Jul 2011 15:46:51 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:35070) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjzCs-0006od-Mz; Thu, 21 Jul 2011 15:46:50 -0400 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id 437D27282F8C; Thu, 21 Jul 2011 21:46:48 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZfMj5A44X9Eu; Thu, 21 Jul 2011 21:46:47 +0200 (CEST) Received: from flocke.weilnetz.de (p54AD9FDE.dip.t-dialin.net [84.173.159.222]) by v220110690675601.yourvserver.net (Postfix) with ESMTPSA id A856B7282F8B; Thu, 21 Jul 2011 21:46:47 +0200 (CEST) Received: from stefan by flocke.weilnetz.de with local (Exim 4.72) (envelope-from ) id 1QjzCo-0001my-F8; Thu, 21 Jul 2011 21:46:46 +0200 From: Stefan Weil To: QEMU Developers Date: Thu, 21 Jul 2011 21:46:45 +0200 Message-Id: <1311277605-6848-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 78.47.199.172 Cc: qemu-trivial@nongnu.org Subject: [Qemu-devel] [PATCH] 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 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 --- 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 768ab0c..53871c2 100644 --- a/slirp/ip_input.c +++ b/slirp/ip_input.c @@ -531,7 +531,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. @@ -574,7 +574,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,