From cdcc6d34b0256aa5efe159351bb24b2e28ed143b Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Mon, 20 Sep 2004 16:52:30 +0000 Subject: Moved strutl.h Author: jgg Date: 1999-01-27 02:48:52 GMT Moved strutl.h --- apt-pkg/acquire-item.cc | 4 ++-- apt-pkg/acquire-method.cc | 4 ++-- apt-pkg/acquire-method.h | 4 ++-- apt-pkg/acquire-worker.cc | 4 ++-- apt-pkg/acquire.cc | 4 ++-- apt-pkg/contrib/cmndline.cc | 4 ++-- apt-pkg/contrib/configuration.cc | 4 ++-- apt-pkg/contrib/strutl.cc | 6 +++--- apt-pkg/contrib/strutl.h | 4 ++-- apt-pkg/deb/deblistparser.cc | 4 ++-- apt-pkg/deb/debrecords.cc | 4 ++-- apt-pkg/makefile | 4 ++-- apt-pkg/pkgcachegen.cc | 5 ++--- apt-pkg/sourcelist.cc | 4 ++-- apt-pkg/tagfile.cc | 4 ++-- cmdline/acqprogress.cc | 4 ++-- cmdline/apt-cache.cc | 4 ++-- cmdline/apt-cdrom.cc | 4 ++-- cmdline/apt-get.cc | 4 ++-- methods/gzip.cc | 4 ++-- 20 files changed, 41 insertions(+), 42 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index aef96687e..d7bcc041b 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-item.cc,v 1.18 1999/01/24 21:16:04 jgg Exp $ +// $Id: acquire-item.cc,v 1.19 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### Acquire Item - Item to acquire @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index e25b26b6a..7f0119819 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-method.cc,v 1.15 1999/01/24 21:16:04 jgg Exp $ +// $Id: acquire-method.cc,v 1.16 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### Acquire Method @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index 7d5e182e7..6aabcb91d 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-method.h,v 1.9 1998/12/22 08:10:34 jgg Exp $ +// $Id: acquire-method.h,v 1.10 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### Acquire Method - Method helper class + functions @@ -14,7 +14,7 @@ #define PKGLIB_ACQUIRE_METHOD_H #include -#include +#include #ifdef __GNUG__ #pragma interface "apt-pkg/acquire-method.h" diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index d6ed38d4a..1ac6e8528 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire-worker.cc,v 1.17 1999/01/20 05:11:25 jgg Exp $ +// $Id: acquire-worker.cc,v 1.18 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### Acquire Worker @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index ab60d1b47..125622e66 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire.cc,v 1.23 1998/12/11 07:20:32 jgg Exp $ +// $Id: acquire.cc,v 1.24 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### Acquire - File Acquiration @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index ccacb9609..3c3717c99 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cmndline.cc,v 1.8 1999/01/18 06:20:07 jgg Exp $ +// $Id: cmndline.cc,v 1.9 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### Command Line Class - Sophisticated command line parser @@ -13,7 +13,7 @@ #endif #include #include -#include +#include /*}}}*/ // CommandLine::CommandLine - Constructor /*{{{*/ diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index e03001f84..e702c26e6 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: configuration.cc,v 1.11 1999/01/18 06:20:07 jgg Exp $ +// $Id: configuration.cc,v 1.12 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### Configuration Class @@ -17,7 +17,7 @@ #endif #include #include -#include +#include #include #include diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 6a90b2b88..e0188e3b8 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: strutl.cc,v 1.17 1999/01/18 06:20:08 jgg Exp $ +// $Id: strutl.cc,v 1.18 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### String Util - Some usefull string functions. @@ -16,10 +16,10 @@ /*}}}*/ // Includes /*{{{*/ #ifdef __GNUG__ -#pragma implementation "strutl.h" +#pragma implementation "apt-pkg/strutl.h" #endif -#include +#include #include #include diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 10d835ba3..e9a31f144 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: strutl.h,v 1.10 1998/11/04 07:11:14 jgg Exp $ +// $Id: strutl.h,v 1.11 1999/01/27 02:48:53 jgg Exp $ /* ###################################################################### String Util - These are some usefull string functions @@ -17,7 +17,7 @@ #define STRUTL_H #ifdef __GNUG__ -#pragma interface "strutl.h" +#pragma interface "apt-pkg/strutl.h" #endif #include diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 669c5cd50..4797694d0 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: deblistparser.cc,v 1.13 1998/12/14 08:07:29 jgg Exp $ +// $Id: deblistparser.cc,v 1.14 1999/01/27 02:48:53 jgg Exp $ /* ###################################################################### Package Cache Generator - Generator for the cache structure. @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include /*}}}*/ diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index c4019b48f..e06533e19 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: debrecords.cc,v 1.3 1998/11/13 04:23:37 jgg Exp $ +// $Id: debrecords.cc,v 1.4 1999/01/27 02:48:53 jgg Exp $ /* ###################################################################### Debian Package Records - Parser for debian package records @@ -83,6 +83,6 @@ string debRecordParser::ShortDesc() /* */ string debRecordParser::LongDesc() { - return string(); + return FindTag("Description"); } /*}}}*/ diff --git a/apt-pkg/makefile b/apt-pkg/makefile index f51e60eca..08b8b2941 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -35,11 +35,11 @@ HEADERS = algorithms.h depcache.h mmap.h pkgcachegen.h cacheiterators.h \ packagemanager.h tagfile.h deblistparser.h init.h pkgcache.h \ version.h progress.h pkgrecords.h debrecords.h cmndline.h \ acquire.h acquire-worker.h acquire-item.h acquire-method.h md5.h \ - dpkgpm.h dpkginit.h cdromutl.h + dpkgpm.h dpkginit.h cdromutl.h strutl.h HEADERS := $(addprefix apt-pkg/,$(HEADERS)) # Private header files -HEADERS+= strutl.h system.h +HEADERS+= system.h include $(LIBRARY_H) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 7cf332b68..89bcec801 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgcachegen.cc,v 1.26 1998/12/14 03:39:15 jgg Exp $ +// $Id: pkgcachegen.cc,v 1.27 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### Package Cache Generator - Generator for the cache structure. @@ -21,8 +21,7 @@ #include #include #include - -#include +#include #include #include diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 371898810..61d5dc7ab 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: sourcelist.cc,v 1.9 1998/12/10 04:22:47 jgg Exp $ +// $Id: sourcelist.cc,v 1.10 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### List of Sources @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index eb0840366..a2f9c0251 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: tagfile.cc,v 1.19 1998/12/14 02:23:47 jgg Exp $ +// $Id: tagfile.cc,v 1.20 1999/01/27 02:48:52 jgg Exp $ /* ###################################################################### Fast scanner for RFC-822 type header information @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index 428f9a4d6..99e8fd9c3 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acqprogress.cc,v 1.6 1998/12/04 23:33:17 jgg Exp $ +// $Id: acqprogress.cc,v 1.7 1999/01/27 02:48:53 jgg Exp $ /* ###################################################################### Acquire Progress - Command line progress meter @@ -11,8 +11,8 @@ #include "acqprogress.h" #include #include +#include #include -#include /*}}}*/ // AcqTextStatus::AcqTextStatus - Constructor /*{{{*/ diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 83fe53dfe..8f6a40e27 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-cache.cc,v 1.21 1998/12/31 01:32:20 jgg Exp $ +// $Id: apt-cache.cc,v 1.22 1999/01/27 02:48:53 jgg Exp $ /* ###################################################################### apt-cache - Manages the cache files @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 0b909a769..85afa10f8 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-cdrom.cc,v 1.15 1998/12/30 06:26:00 jgg Exp $ +// $Id: apt-cdrom.cc,v 1.16 1999/01/27 02:48:53 jgg Exp $ /* ###################################################################### APT CDROM - Tool for handling APT's CDROM database. @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 9749913a7..ef70761c7 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-get.cc,v 1.32 1998/12/31 01:32:20 jgg Exp $ +// $Id: apt-get.cc,v 1.33 1999/01/27 02:48:53 jgg Exp $ /* ###################################################################### apt-get - Cover for dpkg @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include diff --git a/methods/gzip.cc b/methods/gzip.cc index 908407b81..b9808b30e 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: gzip.cc,v 1.6 1998/11/11 06:54:19 jgg Exp $ +// $Id: gzip.cc,v 1.7 1999/01/27 02:48:53 jgg Exp $ /* ###################################################################### GZip method - Take a file URI in and decompress it into the target @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include -- cgit v1.2.3