Rename arguments of mutt_file_read_line for consistency

diff --git a/mutt/file.c b/mutt/file.c
index b7b4865446a8d5c354990d85216175bab3f35116..757ea581aed98c59c3df5a2a1d5e72aa3e4f7f92 100644 (file)
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -617,49 +617,49 @@ int mutt_file_sanitize_regex(char *dest, size_t destlen, const char *src)
 
 /**
  * mutt_file_read_line - Read a line from a file
- * @param[out] s     Buffer allocated on the head (optional)
- * @param[in]  size  Length of buffer (optional)
- * @param[in]  fp    File to read
- * @param[out] line  Current line number
- * @param[in]  flags Flags, e.g. #MUTT_CONT
- * @retval ptr The allocated string
+ * @param[out] line     Buffer allocated on the head (optional)
+ * @param[in]  size     Length of buffer (optional)
+ * @param[in]  fp       File to read
+ * @param[out] line_num Current line number
+ * @param[in]  flags    Flags, e.g. #MUTT_CONT
+ * @retval ptr          The allocated string
  *
  * Read a line from ``fp'' into the dynamically allocated ``s'', increasing
  * ``s'' if necessary. The ending "\n" or "\r\n" is removed.  If a line ends
  * with "\", this char and the linefeed is removed, and the next line is read
  * too.
  */
-char *mutt_file_read_line(char *s, size_t *size, FILE *fp, int *line, int flags)
+char *mutt_file_read_line(char *line, size_t *size, FILE *fp, int *line_num, int flags)
 {
   size_t offset = 0;
   char *ch = NULL;
 
-  if (!s)
+  if (!line)
   {
-    s = mutt_mem_malloc(STRING);
+    line = mutt_mem_malloc(STRING);
     *size = STRING;
   }
 
   while (true)
   {
-    if (!fgets(s + offset, *size - offset, fp))
+    if (!fgets(line + offset, *size - offset, fp))
     {
-      FREE(&s);
+      FREE(&line);
       return NULL;
     }
-    ch = strchr(s + offset, '\n');
+    ch = strchr(line + offset, '\n');
     if (ch)
     {
-      if (line)
-        (*line)++;
+      if (line_num)
+        (*line_num)++;
       if (flags & MUTT_EOL)
-        return s;
+        return line;
       *ch = '\0';
-      if ((ch > s) && (*(ch - 1) == '\r'))
+      if ((ch > line) && (*(ch - 1) == '\r'))
         *--ch = '\0';
-      if (!(flags & MUTT_CONT) || (ch == s) || (*(ch - 1) != '\\'))
-        return s;
-      offset = ch - s - 1;
+      if (!(flags & MUTT_CONT) || (ch == line) || (*(ch - 1) != '\\'))
+        return line;
+      offset = ch - line - 1;
     }
     else
     {
@@ -672,17 +672,17 @@ char *mutt_file_read_line(char *s, size_t *size, FILE *fp, int *line, int flags)
       if (c == EOF)
       {
         /* The last line of fp isn't \n terminated */
-        if (line)
-          (*line)++;
-        return s;
+        if (line_num)
+          (*line_num)++;
+        return line;
       }
       else
       {
         ungetc(c, fp); /* undo our damage */
-        /* There wasn't room for the line -- increase ``s'' */
+        /* There wasn't room for the line -- increase ``line'' */
         offset = *size - 1; /* overwrite the terminating 0 */
         *size += STRING;
-        mutt_mem_realloc(&s, *size);
+        mutt_mem_realloc(&line, *size);
       }
     }
   }

diff --git a/mutt/file.h b/mutt/file.h
index 87681fa8e47a80bcd17092eff76959b5f54767e6..5f12c5d556e7a18d528fb25575a26f9cbbc65e90 100644 (file)
--- a/mutt/file.h
+++ b/mutt/file.h
@@ -104,7 +104,7 @@ FILE *      mutt_file_mkstemp_full(const char *file, int line, const char *func)
 int         mutt_file_open(const char *path, int flags);
 size_t      mutt_file_quote_filename(const char *filename, char *buf, size_t buflen);
 char *      mutt_file_read_keyword(const char *file, char *buf, size_t buflen);
-char *      mutt_file_read_line(char *s, size_t *size, FILE *fp, int *line, int flags);
+char *      mutt_file_read_line(char *line, size_t *size, FILE *fp, int *line_num, int flags);
 int         mutt_file_rename(char *oldfile, char *newfile);
 int         mutt_file_rmtree(const char *path);
 int         mutt_file_safe_rename(const char *src, const char *target);