Browse Source

G++3 fixes from Randolph

Author: jgg
Date: 2001-05-29 04:08:09 GMT
G++3 fixes from Randolph
tags/debian/0.7.21
Arch Librarian 17 years ago
parent
commit
8c58f506d7
2 changed files with 10 additions and 4 deletions
  1. +4
    -3
      ftparchive/writer.cc
  2. +6
    -1
      ftparchive/writer.h

+ 4
- 3
ftparchive/writer.cc View File

@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// $Id: writer.cc,v 1.2 2001/02/20 07:03:18 jgg Exp $
// $Id: writer.cc,v 1.3 2001/05/29 04:08:09 jgg Exp $
/* ######################################################################

Writer
@@ -26,12 +26,14 @@
#include <sys/types.h>
#include <unistd.h>
#include <ftw.h>
#include <iostream>
#include "cachedb.h"
#include "apt-ftparchive.h"
#include "multicompress.h"
/*}}}*/

using namespace std;
FTWScanner *FTWScanner::Owner;

// FTWScanner::FTWScanner - Constructor /*{{{*/
@@ -575,8 +577,7 @@ bool SourcesWriter::DoPackage(string FileName)
string NewFileName;
if (DirStrip.empty() == false &&
FileName.length() > DirStrip.length() &&
stringcmp(OriginalPath,OriginalPath + DirStrip.length(),
DirStrip.begin(),DirStrip.end()) == 0)
stringcmp(DirStrip,OriginalPath,OriginalPath + DirStrip.length()) == 0)
NewFileName = string(OriginalPath + DirStrip.length());
else
NewFileName = OriginalPath;


+ 6
- 1
ftparchive/writer.h View File

@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// $Id: writer.h,v 1.2 2001/02/20 07:03:18 jgg Exp $
// $Id: writer.h,v 1.3 2001/05/29 04:08:09 jgg Exp $
/* ######################################################################

Writer
@@ -19,10 +19,15 @@

#include <string>
#include <stdio.h>
#include <iostream>

#include "cachedb.h"
#include "override.h"
#include "apt-ftparchive.h"

using std::string;
using std::cout;
using std::endl;
class FTWScanner
{


Loading…
Cancel
Save