rename funct

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 96898fc71e09e01e8a6601abbce51b5394083c6d..f8e744d926f78d7f18a421f213ea61f40ba86a7d 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -864,18 +864,18 @@ static int nntp_query(struct NntpData *nntp_data, char *line, size_t linelen)
  * @param query     Query to match
  * @param qlen      Length of query
  * @param msg       Progess message (OPTIONAL)
- * @param funct     Callback function
+ * @param func      Callback function
  * @param data      Data for callback function
  * @retval  0 Success
  * @retval  1 Bad response (answer in query buffer)
  * @retval -1 Connection lost
- * @retval -2 Error in funct(*line, *data)
+ * @retval -2 Error in func(*line, *data)
  *
- * This function calls funct(*line, *data) for each received line,
- * funct(NULL, *data) if rewind(*data) needs, exits when fail or done:
+ * This function calls func(*line, *data) for each received line,
+ * func(NULL, *data) if rewind(*data) needs, exits when fail or done:
  */
 static int nntp_fetch_lines(struct NntpData *nntp_data, char *query, size_t qlen,
-                            const char *msg, int (*funct)(char *, void *), void *data)
+                            const char *msg, int (*func)(char *, void *), void *data)
 {
   int done = false;
   int rc;
@@ -935,7 +935,7 @@ static int nntp_fetch_lines(struct NntpData *nntp_data, char *query, size_t qlen
         if (msg)
           mutt_progress_update(&progress, ++lines, -1);
 
-        if (rc == 0 && funct(line, data) < 0)
+        if (rc == 0 && func(line, data) < 0)
           rc = -2;
         off = 0;
       }
@@ -943,7 +943,7 @@ static int nntp_fetch_lines(struct NntpData *nntp_data, char *query, size_t qlen
       mutt_mem_realloc(&line, off + sizeof(buf));
     }
     FREE(&line);
-    funct(NULL, data);
+    func(NULL, data);
   }
   return rc;
 }

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 0df2e3520904a710069a202d784e1dcfff6ca4d7..92c9be808edbe4fdc0f8bfa99fe5d9fd2cc029c0 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -498,18 +498,18 @@ int pop_query_d(struct PopData *pop_data, char *buf, size_t buflen, char *msg)
  * @param pop_data    POP data
  * @param query       POP query to send to server
  * @param progressbar Progress bar
- * @param funct       Function called for each header read
+ * @param func        Function called for each header read
  * @param data        Data to pass to the callback
  * @retval  0 Successful
  * @retval -1 Connection lost
  * @retval -2 Invalid command or execution error
- * @retval -3 Error in funct(*line, *data)
+ * @retval -3 Error in func(*line, *data)
  *
- * This function calls  funct(*line, *data)  for each received line,
- * funct(NULL, *data)  if  rewind(*data)  needs, exits when fail or done.
+ * This function calls  func(*line, *data)  for each received line,
+ * func(NULL, *data)  if  rewind(*data)  needs, exits when fail or done.
  */
 int pop_fetch_data(struct PopData *pop_data, char *query, struct Progress *progressbar,
-                   int (*funct)(char *, void *), void *data)
+                   int (*func)(char *, void *), void *data)
 {
   char buf[LONG_STRING];
   long pos = 0;
@@ -553,7 +553,7 @@ int pop_fetch_data(struct PopData *pop_data, char *query, struct Progress *progr
     {
       if (progressbar)
         mutt_progress_update(progressbar, pos, -1);
-      if (ret == 0 && funct(inbuf, data) < 0)
+      if (ret == 0 && func(inbuf, data) < 0)
         ret = -3;
       lenbuf = 0;
     }

diff --git a/pop/pop_private.h b/pop/pop_private.h
index 4dec9d786843b2b4b68b223995ff514886012f8d..65fda85b053545579134cccd60ce3fa32628150a 100644 (file)
--- a/pop/pop_private.h
+++ b/pop/pop_private.h
@@ -120,7 +120,7 @@ int pop_connect(struct PopData *pop_data);
 int pop_open_connection(struct PopData *pop_data);
 int pop_query_d(struct PopData *pop_data, char *buf, size_t buflen, char *msg);
 int pop_fetch_data(struct PopData *pop_data, char *query, struct Progress *progressbar,
-                   int (*funct)(char *, void *), void *data);
+                   int (*func)(char *, void *), void *data);
 int pop_reconnect(struct Context *ctx);
 void pop_logout(struct Context *ctx);