From e941befd40c22c4d66bf6587ffbdff745d6ab97c Mon Sep 17 00:00:00 2001 From: Micah Cowan Date: Sun, 5 Jul 2009 21:26:40 -0700 Subject: [PATCH] Avoid name conflict with quote function. --- src/ChangeLog | 5 +++++ src/netrc.c | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b777a8ab..58ee55ba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-07-05 Micah Cowan + + * netrc.c (parse_netrc): Rename local-scope variable "quote" to + "qmark", to avoid conflict with the function name. + 2009-07-05 Petr Pisar * main.c (print_version): Mark initial line for translation, along diff --git a/src/netrc.c b/src/netrc.c index 73de0d07..eb99ff44 100644 --- a/src/netrc.c +++ b/src/netrc.c @@ -266,7 +266,7 @@ parse_netrc (const char *path) char *line, *p, *tok; const char *premature_token; acc_t *current, *retval; - int ln, quote; + int ln, qmark; /* The latest token we've seen in the file. */ enum @@ -295,7 +295,7 @@ parse_netrc (const char *path) /* Parse the line. */ p = line; - quote = 0; + qmark = 0; /* Skip leading whitespace. */ while (*p && c_isspace (*p)) @@ -321,25 +321,25 @@ parse_netrc (const char *path) /* If the token starts with quotation mark, note this fact, and squash the quotation character */ if (*p == '"'){ - quote = 1; + qmark = 1; shift_left (p); } tok = p; /* Find the end of the token, handling quotes and escapes. */ - while (*p && (quote ? *p != '"' : !c_isspace (*p))){ + while (*p && (qmark ? *p != '"' : !c_isspace (*p))){ if (*p == '\\') shift_left (p); p ++; } /* If field was quoted, squash the trailing quotation mark - and reset quote flag. */ - if (quote) + and reset qmark flag. */ + if (qmark) { shift_left (p); - quote = 0; + qmark = 0; } /* Null-terminate the token, if it isn't already. */ -- 2.39.2