reduce delta from ubuntu

[apt.git] / ftparchive / override.cc

diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index 82cbc4c19a8bb060bf07bac2674b64015d8cc2c7..8a0c5bab1d887bbd193b21e6d04dd2ea5e14a9f7 100644 (file)
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -16,6 +16,9 @@
 #include <apt-pkg/error.h>
 
 #include <stdio.h>
 #include <apt-pkg/error.h>
 
 #include <stdio.h>

+#include <ctype.h>
+#include <string.h>
+#include <utility>

 
 #include "override.h"
 
 
 #include "override.h"
 


@@ -34,7 +37,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
    
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
    

-   char Line[500];
+   char Line[1000];

    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {
    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {


@@ -129,7 +132,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
 // Override::ReadExtraOverride - Read the extra override file          /*{{{*/
 // ---------------------------------------------------------------------
 /* This parses the extra override file and reads it into the map */
 // Override::ReadExtraOverride - Read the extra override file          /*{{{*/
 // ---------------------------------------------------------------------
 /* This parses the extra override file and reads it into the map */

-bool Override::ReadExtraOverride(string const &File,bool const &Source)
+bool Override::ReadExtraOverride(string const &File,bool const &/*Source*/)

 {
    if (File.empty() == true)
       return true;
 {
    if (File.empty() == true)
       return true;


@@ -138,7 +141,7 @@ bool Override::ReadExtraOverride(string const &File,bool const &Source)
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
   
    if (F == 0)
       return _error->Errno("fopen",_("Unable to open %s"),File.c_str());
   

-   char Line[500];
+   char Line[1000];

    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {
    unsigned long long Counter = 0;
    while (fgets(Line,sizeof(Line),F) != 0)
    {