Minor fixes

Author: jgg
Date: 1998-11-11 07:30:54 GMT
Minor fixes

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 3ad636b814d0b75469c30233b3cbc41354c2b92d..706222c4058896615af9d1ab1e9f3a61cabcf468 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-method.cc,v 1.6 1998/11/11 06:54:15 jgg Exp $
+// $Id: acquire-method.cc,v 1.7 1998/11/11 07:30:54 jgg Exp $

 /* ######################################################################
 
    Acquire Method
 /* ######################################################################
 
    Acquire Method


@@ -334,8 +334,8 @@ void pkgAcqMethod::Status(const char *Format,...)
 // AcqMethod::FetchResult::FetchResult - Constructor                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // AcqMethod::FetchResult::FetchResult - Constructor                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-pkgAcqMethod::FetchResult::FetchResult() : LastModified(0), 
-                                   IMSHit(false), Size(0)
+pkgAcqMethod::FetchResult::FetchResult() : LastModified(0),
+                                   IMSHit(false), Size(0), ResumePoint(0)

 {
 }
                                                                        /*}}}*/
 {
 }
                                                                        /*}}}*/

diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index ccc28a3f70f7e0cff6f72545f133107d254e43a6..8493691caf2420513a7167319a6c74a0426c6849 100644 (file)
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire.cc,v 1.11 1998/11/11 06:54:16 jgg Exp $
+// $Id: acquire.cc,v 1.12 1998/11/11 07:30:55 jgg Exp $

 /* ######################################################################
 
    Acquire - File Acquiration
 /* ######################################################################
 
    Acquire - File Acquiration


@@ -636,7 +636,7 @@ void pkgAcquireStatus::Stop()
 // ---------------------------------------------------------------------
 /* This is used to get accurate final transfer rate reporting. */
 void pkgAcquireStatus::Fetched(unsigned long Size,unsigned long Resume)
 // ---------------------------------------------------------------------
 /* This is used to get accurate final transfer rate reporting. */
 void pkgAcquireStatus::Fetched(unsigned long Size,unsigned long Resume)

-{
+{   

    FetchedBytes += Size - Resume;
 }
                                                                        /*}}}*/
    FetchedBytes += Size - Resume;
 }
                                                                        /*}}}*/

diff --git a/test/scratch.cc b/test/scratch.cc
index c9ddc2ea4b356aa370e688c0a925d2b42bbeeeaa..74c976700210bc5d53e8a3306abb773dd131657d 100644 (file)
--- a/test/scratch.cc
+++ b/test/scratch.cc
@@ -103,7 +103,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
    
    enum {Long = 0,Medium,Short} Mode = Long;
    
    
    enum {Long = 0,Medium,Short} Mode = Long;
    

-   ScreenWidth = 140;
+   ScreenWidth = 78;

    char Buffer[300];
    char *End = Buffer + sizeof(Buffer);
    char *S = Buffer;
    char Buffer[300];
    char *End = Buffer + sizeof(Buffer);
    char *S = Buffer;