Changeset 73832 in vbox

Timestamp:

Aug 22, 2018 3:24:59 PM (6 years ago)

Author:

vboxsync

Message:

http-curl.cpp: Rename http callback typedefs to conform to the iprt
naming scheme (FNRT..., PFNRT...).

Location:

trunk

Files:

• include/iprt/http.h (modified) (2 diffs)
• src/VBox/Runtime/generic/http-curl.cpp (modified) (5 diffs)

trunk/include/iprt/http.h

@@ -45 +45 @@
 #define NIL_RTHTTP                              ((RTHTTP)0)
 /** Callback function to be called during RTHttpGet*(). Register it using RTHttpSetDownloadProgressCallback(). */
-typedef DECLCALLBACK(void) RTHTTPDOWNLDPROGRCALLBACK(RTHTTP hHttp, void *pvUser, uint64_t cbDownloadTotal, uint64_t cbDownloaded);
-typedef RTHTTPDOWNLDPROGRCALLBACK *PRTHTTPDOWNLDPROGRCALLBACK;
+typedef DECLCALLBACK(void) FNRTHTTPDOWNLDPROGRCALLBACK(RTHTTP hHttp, void *pvUser, uint64_t cbDownloadTotal, uint64_t cbDownloaded);
+typedef FNRTHTTPDOWNLDPROGRCALLBACK *PFNRTHTTPDOWNLDPROGRCALLBACK;
 
 
@@ -317 +317 @@
  * @param   pvUser          Convenience pointer for the callback function.
  */
-RTR3DECL(int) RTHttpSetDownloadProgressCallback(RTHTTP hHttp, PRTHTTPDOWNLDPROGRCALLBACK pfnDownloadProgress, void *pvUser);
+RTR3DECL(int) RTHttpSetDownloadProgressCallback(RTHTTP hHttp, PFNRTHTTPDOWNLDPROGRCALLBACK pfnDownloadProgress, void *pvUser);
 
 // ----8<--------8<---- XXX: uwe: quick and dirty curl wrappers for OCI
 
-typedef DECLCALLBACK(size_t) RTHTTPREADCALLBACK(void *pbDst, size_t cbItem, size_t cItems, void *pvUser);
-typedef RTHTTPREADCALLBACK *PRTHTTPREADCALLBACK;
+typedef DECLCALLBACK(size_t) FNRTHTTPREADCALLBACK(void *pbDst, size_t cbItem, size_t cItems, void *pvUser);
+typedef FNRTHTTPREADCALLBACK *PFNRTHTTPREADCALLBACK;
 
 #define RT_HTTP_READCALLBACK_ABORT 0x10000000 /* CURL_READFUNC_ABORT */
 
-RTR3DECL(int) RTHttpSetReadCallback(RTHTTP hHttp, PRTHTTPREADCALLBACK pfnRead, void *pvUser);
-
-
-typedef DECLCALLBACK(size_t) RTHTTPWRITECALLBACK(char *pbSrc, size_t cbItem, size_t cItems, void *pvUser);
-typedef RTHTTPWRITECALLBACK *PRTHTTPWRITECALLBACK;
-
-RTR3DECL(int) RTHttpSetWriteCallback(RTHTTP hHttp, PRTHTTPWRITECALLBACK pfnWrite, void *pvUser);
-RTR3DECL(int) RTHttpSetWriteHeaderCallback(RTHTTP hHttp, PRTHTTPWRITECALLBACK pfnWrite, void *pvUser);
+RTR3DECL(int) RTHttpSetReadCallback(RTHTTP hHttp, PFNRTHTTPREADCALLBACK pfnRead, void *pvUser);
+
+
+typedef DECLCALLBACK(size_t) FNRTHTTPWRITECALLBACK(char *pbSrc, size_t cbItem, size_t cItems, void *pvUser);
+typedef FNRTHTTPWRITECALLBACK *PFNRTHTTPWRITECALLBACK;
+
+RTR3DECL(int) RTHttpSetWriteCallback(RTHTTP hHttp, PFNRTHTTPWRITECALLBACK pfnWrite, void *pvUser);
+RTR3DECL(int) RTHttpSetWriteHeaderCallback(RTHTTP hHttp, PFNRTHTTPWRITECALLBACK pfnWrite, void *pvUser);
 
 

trunk/src/VBox/Runtime/generic/http-curl.cpp

@@ -161 +161 @@
     uint64_t            cbDownloadHint;
     /** Callback called during download. */
-    PRTHTTPDOWNLDPROGRCALLBACK pfnDownloadProgress;
+    PFNRTHTTPDOWNLDPROGRCALLBACK pfnDownloadProgress;
     /** User pointer parameter for pfnDownloadProgress. */
     void               *pvDownloadProgressUser;
@@ -2576 +2576 @@
 
 
-RTR3DECL(int) RTHttpSetDownloadProgressCallback(RTHTTP hHttp, PRTHTTPDOWNLDPROGRCALLBACK pfnDownloadProgress, void *pvUser)
+RTR3DECL(int) RTHttpSetDownloadProgressCallback(RTHTTP hHttp, PFNRTHTTPDOWNLDPROGRCALLBACK pfnDownloadProgress, void *pvUser)
 {
     PRTHTTPINTERNAL pThis = hHttp;
@@ -2588 +2588 @@
 
 
-RTR3DECL(int) RTHttpSetReadCallback(RTHTTP hHttp, PRTHTTPREADCALLBACK pfnRead, void *pvUser)
+RTR3DECL(int) RTHttpSetReadCallback(RTHTTP hHttp, PFNRTHTTPREADCALLBACK pfnRead, void *pvUser)
 {
     CURLcode rcCurl;
@@ -2607 +2607 @@
 
 
-RTR3DECL(int) RTHttpSetWriteCallback(RTHTTP hHttp, PRTHTTPWRITECALLBACK pfnWrite, void *pvUser)
+RTR3DECL(int) RTHttpSetWriteCallback(RTHTTP hHttp, PFNRTHTTPWRITECALLBACK pfnWrite, void *pvUser)
 {
     CURLcode rcCurl;
@@ -2626 +2626 @@
 
 
-RTR3DECL(int) RTHttpSetWriteHeaderCallback(RTHTTP hHttp, PRTHTTPWRITECALLBACK pfnWrite, void *pvUser)
+RTR3DECL(int) RTHttpSetWriteHeaderCallback(RTHTTP hHttp, PFNRTHTTPWRITECALLBACK pfnWrite, void *pvUser)
 {
     CURLcode rcCurl;