From owner-cvs-src@FreeBSD.ORG Thu May 24 23:50:58 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0BB4216A400; Thu, 24 May 2007 23:50:58 +0000 (UTC) (envelope-from sam@errno.com) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.freebsd.org (Postfix) with ESMTP id CD4B513C448; Thu, 24 May 2007 23:50:57 +0000 (UTC) (envelope-from sam@errno.com) Received: from trouble.errno.com (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id l4ONovjW033601 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 May 2007 16:50:57 -0700 (PDT) (envelope-from sam@errno.com) Message-ID: <465624E0.5010708@errno.com> Date: Thu, 24 May 2007 16:50:56 -0700 From: Sam Leffler User-Agent: Thunderbird 2.0.0.0 (X11/20070430) MIME-Version: 1.0 To: Andre Oppermann References: <200705231916.l4NJGLY4076073@repoman.freebsd.org> <20070524222353.GA30597@heff.fud.org.nz> <4656241E.3070704@freebsd.org> In-Reply-To: <4656241E.3070704@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org, Andrew Thompson Subject: Re: cvs commit: src/sys/netinet tcp.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 May 2007 23:50:58 -0000 Andre Oppermann wrote: > Andrew Thompson wrote: >> On Wed, May 23, 2007 at 07:16:21PM +0000, Andre Oppermann wrote: >>> andre 2007-05-23 19:16:21 UTC >>> >>> FreeBSD src repository >>> >>> Modified files: >>> sys/netinet tcp.h Log: >>> Add CWR back into the PRINT_TH_FLAGS list as gcc42 doesn't complain >>> about \8 in a string anymore. >>> Revision Changes Path >>> 1.39 +1 -1 src/sys/netinet/tcp.h >>> >>> - * $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netinet/tcp.h,v >>> 1.38 2007/05/18 19:58:37 andre Exp $ >>> + * $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netinet/tcp.h,v >>> 1.39 2007/05/23 19:16:21 andre Exp $ >>> */ >>> >>> #ifndef _NETINET_TCP_H_ >>> @@ -69,7 +69,7 @@ struct tcphdr { >>> #define TH_ECE 0x40 >>> #define TH_CWR 0x80 >>> #define TH_FLAGS >>> (TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG|TH_ECE|TH_CWR) >>> -#define PRINT_TH_FLAGS "\20\1FIN\2SYN\3RST\4PUSH\5ACK\6URG\7ECE" >>> +#define PRINT_TH_FLAGS >>> "\20\1FIN\2SYN\3RST\4PUSH\5ACK\6URG\7ECE\8CWR" >> >> Shouldnt this be \10 instead of \8 > > man printf(9) doesn't say so. However gcc42 doesn't accept it > either, it just prints an error but continues. > > The arguments are made up of a sequence of bit identifiers. > Each bit identifier begins with an integer value which is > the number of the bit (starting from 1) this identifier > describes. The rest of the identifier is a string of > characters containing the name of the bit. The string is > terminated by either the bit number at the start of the next > bit identifier or NUL for the last bit identifier. > > The whole situation is a bit confusing. > The numbers are in octal. Always have been. You can probably use \x for hex instead if you want; I think that's c99. Sam