From owner-svn-src-head@FreeBSD.ORG Thu Feb 16 05:17:03 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2599F106578A; Thu, 16 Feb 2012 05:17:01 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A89F08FC1D; Thu, 16 Feb 2012 05:17:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1G5H1sN000120; Thu, 16 Feb 2012 05:17:01 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1G5H14i000118; Thu, 16 Feb 2012 05:17:01 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201202160517.q1G5H14i000118@svn.freebsd.org> From: Eitan Adler Date: Thu, 16 Feb 2012 05:17:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231816 - head/usr.bin/gencat X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2012 05:17:03 -0000 Author: eadler Date: Thu Feb 16 05:17:01 2012 New Revision: 231816 URL: http://svn.freebsd.org/changeset/base/231816 Log: Removed unused code: fixes compiler warning with CC=gcc46 error: parameter 'fd' set but not used Approved by: cperciva MFC after: 1 week Modified: head/usr.bin/gencat/gencat.c Modified: head/usr.bin/gencat/gencat.c ============================================================================== --- head/usr.bin/gencat/gencat.c Thu Feb 16 05:16:55 2012 (r231815) +++ head/usr.bin/gencat/gencat.c Thu Feb 16 05:17:01 2012 (r231816) @@ -462,89 +462,6 @@ MCParse(int fd) } } -void -MCReadCat(int fd) -{ - fd = 0; -#if 0 - MCHeaderT mcHead; - MCMsgT mcMsg; - MCSetT mcSet; - msgT *msg; - setT *set; - int i; - char *data; - - /* XXX init sethead? */ - - if (read(fd, &mcHead, sizeof(mcHead)) != sizeof(mcHead)) - CORRUPT(); - if (strncmp(mcHead.magic, MCMagic, MCMagicLen) != 0) - CORRUPT(); - if (mcHead.majorVer != MCMajorVer) - error("unrecognized catalog version"); - if ((mcHead.flags & MCGetByteOrder()) == 0) - error("wrong byte order"); - - if (lseek(fd, mcHead.firstSet, SEEK_SET) == -1) - CORRUPT(); - - for (;;) { - if (read(fd, &mcSet, sizeof(mcSet)) != sizeof(mcSet)) - CORRUPT(); - if (mcSet.invalid) - continue; - - set = xmalloc(sizeof(setT)); - memset(set, '\0', sizeof(*set)); - if (cat->first) { - cat->last->next = set; - set->prev = cat->last; - cat->last = set; - } else - cat->first = cat->last = set; - - set->setId = mcSet.setId; - - /* Get the data */ - if (mcSet.dataLen) { - data = xmalloc(mcSet.dataLen); - if (lseek(fd, mcSet.data.off, SEEK_SET) == -1) - CORRUPT(); - if (read(fd, data, mcSet.dataLen) != mcSet.dataLen) - CORRUPT(); - if (lseek(fd, mcSet.u.firstMsg, SEEK_SET) == -1) - CORRUPT(); - - for (i = 0; i < mcSet.numMsgs; ++i) { - if (read(fd, &mcMsg, sizeof(mcMsg)) != sizeof(mcMsg)) - CORRUPT(); - if (mcMsg.invalid) { - --i; - continue; - } - msg = xmalloc(sizeof(msgT)); - memset(msg, '\0', sizeof(*msg)); - if (set->first) { - set->last->next = msg; - msg->prev = set->last; - set->last = msg; - } else - set->first = set->last = msg; - - msg->msgId = mcMsg.msgId; - msg->str = xstrdup((char *) (data + mcMsg.msg.off)); - } - free(data); - } - if (!mcSet.nextSet) - break; - if (lseek(fd, mcSet.nextSet, SEEK_SET) == -1) - CORRUPT(); - } -#endif -} - /* * Write message catalog. *