lots of cppcheck fixes

[apt.git] / apt-pkg / contrib / netrc.cc

diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index 34f472ee1b619c1bc85e860c1d1148126c492f45..9ff5796c53dde219d961e5884a1f3eb57bc2ac51 100644 (file)
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -47,10 +47,7 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
   int specific_login = (login[0] != 0);
   char *home = NULL;
   bool netrc_alloc = false;
   int specific_login = (login[0] != 0);
   char *home = NULL;
   bool netrc_alloc = false;

-  int state = NOTHING;

 
 

-  char state_login = 0;        /* Found a login keyword */
-  char state_password = 0;     /* Found a password keyword */

   int state_our_login = false;  /* With specific_login,
                                    found *our* login name */
 
   int state_our_login = false;  /* With specific_login,
                                    found *our* login name */
 


@@ -81,6 +78,10 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
     bool done = false;
     char netrcbuffer[256];
 
     bool done = false;
     char netrcbuffer[256];
 

+    int state = NOTHING;
+    char state_login = 0;        /* Found a login keyword */
+    char state_password = 0;     /* Found a password keyword */
+

     while (!done && fgets(netrcbuffer, sizeof (netrcbuffer), file)) {
       tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);
       while (!done && tok) {
     while (!done && fgets(netrcbuffer, sizeof (netrcbuffer), file)) {
       tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);
       while (!done && tok) {