From lulf@FreeBSD.org  Tue Feb 25 19:57:44 2014
Return-Path: <lulf@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 1F48375B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Feb 2014 19:57:44 +0000 (UTC)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 0A3EB1277
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Feb 2014 19:57:44 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s1PJvhG9085350
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Feb 2014 19:57:43 GMT
	(envelope-from lulf@freefall.freebsd.org)
Received: (from lulf@localhost)
	by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s1PJvh8Z085349;
	Tue, 25 Feb 2014 19:57:43 GMT
	(envelope-from lulf)
Message-Id: <201402251957.s1PJvh8Z085349@freefall.freebsd.org>
Date: Tue, 25 Feb 2014 19:57:43 GMT
From: Ulf Lilleengen <lulf@freebsd.org>
Reply-To: Ulf Lilleengen <lulf@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] no need for csup to embed its own queue.h implementation
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         187067
>Category:       bin
>Synopsis:       [PATCH] no need for csup to embed its own queue.h implementation
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    eadler
>State:          patched
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 25 20:00:00 UTC 2014
>Closed-Date:    
>Last-Modified:  Wed Apr 16 02:14:28 UTC 2014
>Originator:     Ulf Lilleengen
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
>Environment:

>Description:
While browsing the src code i noticed csup contains its own queue.h implementation. This comes from the time
where csup was not part of freebsd base system.

>How-To-Repeat:
>Fix:
Patch that removes queue.h and modifies source to use system queue.h:

http://people.freebsd.org/~lulf/patches/0001-No-need-for-csup-to-embed-its-own-queue-implementati.patch

>Release-Note:
>Audit-Trail:

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/187067: commit references a PR
Date: Sat, 15 Mar 2014 01:20:48 +0000 (UTC)

 Author: eadler
 Date: Sat Mar 15 01:20:42 2014
 New Revision: 263201
 URL: http://svnweb.freebsd.org/changeset/base/263201
 
 Log:
   Use the system queue.h instead of bundling its own.
   
   PR:		bin/187067
   Submitted by:	lulf
 
 Deleted:
   head/usr.bin/csup/queue.h
 Modified:
   head/usr.bin/csup/config.h
   head/usr.bin/csup/diff.c
   head/usr.bin/csup/fixups.c
   head/usr.bin/csup/fixups.h
   head/usr.bin/csup/keyword.c
   head/usr.bin/csup/proto.c
   head/usr.bin/csup/rcsfile.c
   head/usr.bin/csup/rcsparse.c
   head/usr.bin/csup/status.c
   head/usr.bin/csup/threads.c
 
 Modified: head/usr.bin/csup/config.h
 ==============================================================================
 --- head/usr.bin/csup/config.h	Sat Mar 15 00:59:23 2014	(r263200)
 +++ head/usr.bin/csup/config.h	Sat Mar 15 01:20:42 2014	(r263201)
 @@ -30,11 +30,11 @@
  
  #include <sys/types.h>
  #include <sys/socket.h>
 +#include <sys/queue.h>
  
  #include <time.h>
  
  #include "fattr.h"
 -#include "queue.h"
  #include "misc.h"
  
  /*
 
 Modified: head/usr.bin/csup/diff.c
 ==============================================================================
 --- head/usr.bin/csup/diff.c	Sat Mar 15 00:59:23 2014	(r263200)
 +++ head/usr.bin/csup/diff.c	Sat Mar 15 01:20:42 2014	(r263201)
 @@ -26,6 +26,8 @@
   * $FreeBSD$
   */
  
 +#include <sys/queue.h>
 +
  #include <assert.h>
  #include <err.h>
  #include <errno.h>
 @@ -38,7 +40,6 @@
  #include "keyword.h"
  #include "misc.h"
  #include "stream.h"
 -#include "queue.h"
  
  typedef long lineno_t;
  
 
 Modified: head/usr.bin/csup/fixups.c
 ==============================================================================
 --- head/usr.bin/csup/fixups.c	Sat Mar 15 00:59:23 2014	(r263200)
 +++ head/usr.bin/csup/fixups.c	Sat Mar 15 01:20:42 2014	(r263201)
 @@ -26,6 +26,8 @@
   * $FreeBSD$
   */
  
 +#include <sys/queue.h>
 +
  #include <assert.h>
  #include <pthread.h>
  #include <stdlib.h>
 @@ -33,7 +35,6 @@
  
  #include "fixups.h"
  #include "misc.h"
 -#include "queue.h"
  
  /*
   * A synchronized queue to implement fixups.  The updater thread adds
 
 Modified: head/usr.bin/csup/fixups.h
 ==============================================================================
 --- head/usr.bin/csup/fixups.h	Sat Mar 15 00:59:23 2014	(r263200)
 +++ head/usr.bin/csup/fixups.h	Sat Mar 15 01:20:42 2014	(r263201)
 @@ -28,7 +28,7 @@
  #ifndef _FIXUPS_H_
  #define _FIXUPS_H_
  
 -#include "queue.h"
 +#include <sys/queue.h>
  
  struct coll;
  struct fixups;
 
 Modified: head/usr.bin/csup/keyword.c
 ==============================================================================
 --- head/usr.bin/csup/keyword.c	Sat Mar 15 00:59:23 2014	(r263200)
 +++ head/usr.bin/csup/keyword.c	Sat Mar 15 01:20:42 2014	(r263201)
 @@ -26,6 +26,8 @@
   * $FreeBSD$
   */
  
 +#include <sys/queue.h>
 +
  #include <assert.h>
  #include <err.h>
  #include <errno.h>
 @@ -37,7 +39,6 @@
  #include "diff.h"
  #include "keyword.h"
  #include "misc.h"
 -#include "queue.h"
  #include "stream.h"
  
  /*
 
 Modified: head/usr.bin/csup/proto.c
 ==============================================================================
 --- head/usr.bin/csup/proto.c	Sat Mar 15 00:59:23 2014	(r263200)
 +++ head/usr.bin/csup/proto.c	Sat Mar 15 01:20:42 2014	(r263201)
 @@ -31,6 +31,7 @@
  #include <sys/socket.h>
  #include <sys/types.h>
  #include <sys/stat.h>
 +#include <sys/queue.h>
  
  #include <assert.h>
  #include <err.h>
 @@ -57,7 +58,6 @@
  #include "misc.h"
  #include "mux.h"
  #include "proto.h"
 -#include "queue.h"
  #include "stream.h"
  #include "threads.h"
  #include "updater.h"
 
 Modified: head/usr.bin/csup/rcsfile.c
 ==============================================================================
 --- head/usr.bin/csup/rcsfile.c	Sat Mar 15 00:59:23 2014	(r263200)
 +++ head/usr.bin/csup/rcsfile.c	Sat Mar 15 01:20:42 2014	(r263201)
 @@ -26,6 +26,8 @@
   * $FreeBSD$
   */
  
 +#include <sys/queue.h>
 +
  #include <assert.h>
  #include <err.h>
  #include <errno.h>
 @@ -37,7 +39,6 @@
  #include "keyword.h"
  #include "misc.h"
  #include "proto.h"
 -#include "queue.h"
  #include "rcsfile.h"
  #include "rcsparse.h"
  #include "stream.h"
 
 Modified: head/usr.bin/csup/rcsparse.c
 ==============================================================================
 --- head/usr.bin/csup/rcsparse.c	Sat Mar 15 00:59:23 2014	(r263200)
 +++ head/usr.bin/csup/rcsparse.c	Sat Mar 15 01:20:42 2014	(r263201)
 @@ -26,12 +26,13 @@
   * $FreeBSD$
   */
  
 +#include <sys/queue.h>
 +
  #include <assert.h>
  #include <stdio.h>
  #include <stdlib.h>
  
  #include "misc.h"
 -#include "queue.h"
  #include "rcsfile.h"
  #include "rcsparse.h"
  #include "rcstokenizer.h"
 
 Modified: head/usr.bin/csup/status.c
 ==============================================================================
 --- head/usr.bin/csup/status.c	Sat Mar 15 00:59:23 2014	(r263200)
 +++ head/usr.bin/csup/status.c	Sat Mar 15 01:20:42 2014	(r263201)
 @@ -26,6 +26,8 @@
   * $FreeBSD$
   */
  
 +#include <sys/queue.h>
 +
  #include <assert.h>
  #include <errno.h>
  #include <fcntl.h>
 @@ -39,7 +41,6 @@
  #include "misc.h"
  #include "pathcomp.h"
  #include "proto.h"
 -#include "queue.h"
  #include "status.h"
  #include "stream.h"
  
 
 Modified: head/usr.bin/csup/threads.c
 ==============================================================================
 --- head/usr.bin/csup/threads.c	Sat Mar 15 00:59:23 2014	(r263200)
 +++ head/usr.bin/csup/threads.c	Sat Mar 15 01:20:42 2014	(r263201)
 @@ -26,13 +26,14 @@
   * $FreeBSD$
   */
  
 +#include <sys/queue.h>
 +
  #include <assert.h>
  #include <err.h>
  #include <pthread.h>
  #include <stdlib.h>
  
  #include "misc.h"
 -#include "queue.h"
  #include "threads.h"
  
  /*
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: linimon 
State-Changed-When: Wed Apr 16 02:13:45 UTC 2014 
State-Changed-Why:  
over to commmiter as MFC reminder. 


Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Apr 16 02:13:45 UTC 2014 
Responsible-Changed-Why:  

http://www.freebsd.org/cgi/query-pr.cgi?pr=187067 
>Unformatted:
