add Curl_ prefix to conform with cURL naming standards

diff --git a/lib/ftp.c b/lib/ftp.c
index 935ab31dc4994d105a6474c00f3d5c1897e98484..51276c09fa5adaceb54e0820a0be09e7ef057db8 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -3474,7 +3474,7 @@ static void wc_data_dtor(void *ptr)
 {
   struct ftp_wc_tmpdata *tmp = ptr;
   if(tmp)
-    ftp_parselist_data_free(&tmp->parser);
+    Curl_ftp_parselist_data_free(&tmp->parser);
   Curl_safefree(tmp);
 }
 
@@ -3525,7 +3525,7 @@ static CURLcode init_wc_data(struct connectdata *conn)
   }
 
   /* INITIALIZE parselist structure */
-  ftp_tmp->parser = ftp_parselist_data_alloc();
+  ftp_tmp->parser = Curl_ftp_parselist_data_alloc();
   if(!ftp_tmp->parser)
     return CURLE_OUT_OF_MEMORY;
 
@@ -3545,7 +3545,7 @@ static CURLcode init_wc_data(struct connectdata *conn)
   /* backup old write_function */
   ftp_tmp->backup.write_function = conn->data->set.fwrite_func;
   /* parsing write function (callback included directly from ftplistparser.c) */
-  conn->data->set.fwrite_func = ftp_parselist;
+  conn->data->set.fwrite_func = Curl_ftp_parselist;
   /* backup old file descriptor */
   ftp_tmp->backup.file_descriptor = conn->data->set.out;
   /* let the writefunc callback know what curl pointer is working with */
@@ -3586,7 +3586,7 @@ static CURLcode wc_statemach(struct connectdata *conn)
     conn->data->set.out = ftp_tmp->backup.file_descriptor;
     wildcard->state = CURLWC_DOWNLOADING;
 
-    if(ftp_parselist_geterror(ftp_tmp->parser)) {
+    if(Curl_ftp_parselist_geterror(ftp_tmp->parser)) {
       /* error found in LIST parsing */
       wildcard->state = CURLWC_CLEAN;
       return wc_statemach(conn);
@@ -3670,7 +3670,7 @@ static CURLcode wc_statemach(struct connectdata *conn)
   case CURLWC_CLEAN:
     ret = CURLE_OK;
     if(ftp_tmp) {
-      ret = ftp_parselist_geterror(ftp_tmp->parser);
+      ret = Curl_ftp_parselist_geterror(ftp_tmp->parser);
     }
     wildcard->state = ret ? CURLWC_ERROR : CURLWC_DONE;
     break;

diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c
index ac6d076756cf87904736559094e2381e0a0bf6f1..3dd66178862691323658f17d11dadb6eee706f69 100644 (file)
--- a/lib/ftplistparser.c
+++ b/lib/ftplistparser.c
@@ -188,7 +188,7 @@ struct ftp_parselist_data {
   } offsets;
 };
 
-struct ftp_parselist_data *ftp_parselist_data_alloc(void)
+struct ftp_parselist_data *Curl_ftp_parselist_data_alloc(void)
 {
   struct ftp_parselist_data *parselist_data =
       malloc(sizeof(struct ftp_parselist_data));
@@ -199,7 +199,7 @@ struct ftp_parselist_data *ftp_parselist_data_alloc(void)
 }
 
 
-void ftp_parselist_data_free(struct ftp_parselist_data **pl_data)
+void Curl_ftp_parselist_data_free(struct ftp_parselist_data **pl_data)
 {
   if(*pl_data)
     free(*pl_data);
@@ -207,7 +207,7 @@ void ftp_parselist_data_free(struct ftp_parselist_data **pl_data)
 }
 
 
-CURLcode ftp_parselist_geterror(struct ftp_parselist_data *pl_data)
+CURLcode Curl_ftp_parselist_geterror(struct ftp_parselist_data *pl_data)
 {
   return pl_data->error;
 }
@@ -365,7 +365,8 @@ static CURLcode ftp_pl_insert_finfo(struct connectdata *conn,
   return CURLE_OK;
 }
 
-size_t ftp_parselist(char *buffer, size_t size, size_t nmemb, void *connptr)
+size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
+                          void *connptr)
 {
   size_t bufflen = size*nmemb;
   struct connectdata *conn = (struct connectdata *)connptr;

diff --git a/lib/ftplistparser.h b/lib/ftplistparser.h
index 5a16abf6a16dd6c5400630c6d0ea8566b452ee7c..67a06c296d68d432549aae57baa9495da4a09b52 100644 (file)
--- a/lib/ftplistparser.h
+++ b/lib/ftplistparser.h
@@ -25,14 +25,15 @@
 #include <curl/curl.h>
 
 /* WRITEFUNCTION callback for parsing LIST responses */
-size_t ftp_parselist(char *buffer, size_t size, size_t nmemb, void *connptr);
+size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb,
+                          void *connptr);
 
 struct ftp_parselist_data; /* defined inside ftplibparser.c */
 
-CURLcode ftp_parselist_geterror(struct ftp_parselist_data *pl_data);
+CURLcode Curl_ftp_parselist_geterror(struct ftp_parselist_data *pl_data);
 
-struct ftp_parselist_data *ftp_parselist_data_alloc(void);
+struct ftp_parselist_data *Curl_ftp_parselist_data_alloc(void);
 
-void ftp_parselist_data_free(struct ftp_parselist_data **pl_data);
+void Curl_ftp_parselist_data_free(struct ftp_parselist_data **pl_data);
 
 #endif /* HEADER_CURL_FTPLISTPARSER_H */