[patch] fix libopensync-plugin-opie compilation with new libcurl

[please keep me in CC, I'm not subscribed]

Hi,

libcurl 7.18.1 added some warnings about incorrect curl_easy_setopt()
usage, breaking build of libopensync-plugin-opie (due to -Werror):

cc1: warnings being treated as errors
opie_comms.c: In function 'ftp_put_notes':
opie_comms.c:696: error: call to '_curl_easy_setopt_err_write_callback'
declared with attribute warning: curl_easy_setopt expects a
curl_write_callback argument for this option
opie_comms.c:710: error: call to '_curl_easy_setopt_err_read_cb'
declared with attribute warning: curl_easy_setopt expects a
curl_read_callback argument for this option
opie_comms.c: In function 'ftp_fetch_notes':
opie_comms.c:581: error: call to '_curl_easy_setopt_err_write_callback'
declared with attribute warning: curl_easy_setopt expects a
curl_write_callback argument for this option
opie_comms.c: In function 'ftp_fetch_files':
opie_comms.c:487: error: call to '_curl_easy_setopt_err_write_callback'
declared with attribute warning: curl_easy_setopt expects a
curl_write_callback argument for this option
make[2]: *** [opie_comms.lo] Error 1

Attached is a patch for 0.22 that fixed the build for me. An untested
patch for 0.36 is attached, too.

have a nice day,
Michal


---
 src/opie_comms.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- src/opie_comms.c.orig
+++ src/opie_comms.c
@@ -64,10 +64,10 @@ const char *OPIE_TODO_FILE     = "Applic
 const char *OPIE_CALENDAR_FILE = "Applications/datebook/datebook.xml";
 const char *OPIE_CATEGORY_FILE = "Settings/Categories.xml";
 
-int opie_curl_fwrite(void* buffer, size_t size, size_t nmemb, void* stream);
-int opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream);
-int opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream);
-int opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream);
+size_t opie_curl_fwrite(void* buffer, size_t size, size_t nmemb, void* stream);
+size_t opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream);
+size_t opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream);
+size_t opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream);
 gboolean ftp_fetch_files(OpieSyncEnv* env, GList* files_to_fetch);
 gboolean scp_fetch_files(OpieSyncEnv* env, GList* files_to_fetch);
 gboolean ftp_put_files(OpieSyncEnv* env, GList* files_to_put);
@@ -1146,7 +1146,7 @@ gboolean scp_put_files(OpieSyncEnv* env,
 /*
  * opie_curl_fwrite
  */
-int opie_curl_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
 {
  size_t written = fwrite(buffer, size, nmemb, (FILE *)stream);
  return written;
@@ -1155,7 +1155,7 @@ int opie_curl_fwrite(void *buffer, size_
 /*
  * opie_curl_strwrite
  */
-int opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream)
 {
  g_string_append_len((GString *)stream, buffer, size * nmemb);
  return size * nmemb;
@@ -1164,7 +1164,7 @@ int opie_curl_strwrite(void *buffer, siz
 /*
  * opie_curl_nullwrite
  */
-int opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream)
 {
  return size * nmemb;
 }
@@ -1172,13 +1172,13 @@ int opie_curl_nullwrite(void *buffer, si
 /*
  * opie_curl_strread
  */
-int opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream)
 {
  char *str = ((char *)stream) + m_totalwritten;
  if(str[0] == '\0')
  return 0;
 
- int numbytes = strlen(str);
+ size_t numbytes = strlen(str);
  if(numbytes >= (nmemb * size))
  numbytes = (nmemb * size);
  memcpy(buffer, str, numbytes);

---
 src/opie_comms.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- libopensync-plugin-opie-0.36.orig/src/opie_comms.c
+++ libopensync-plugin-opie-0.36/src/opie_comms.c
@@ -45,10 +45,10 @@
 #include "opie_xml.h"
 #include "opie_qcop.h"
 
-int opie_curl_fwrite(void* buffer, size_t size, size_t nmemb, void* stream);
-int opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream);
-int opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream);
-int opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream);
+size_t opie_curl_fwrite(void* buffer, size_t size, size_t nmemb, void* stream);
+size_t opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream);
+size_t opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream);
+size_t opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream);
 gboolean local_fetch_file(OpiePluginEnv* env, const char *remotefile, GString **data);
 gboolean ftp_fetch_file(OpiePluginEnv* env, const char *remotefile, GString **data);
 gboolean scp_fetch_file(OpiePluginEnv* env, const char *remotefile, GString **data);
@@ -1424,7 +1424,7 @@ error:
 /*
  * opie_curl_fwrite
  */
-int opie_curl_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_fwrite(void *buffer, size_t size, size_t nmemb, void *stream)
 {
  size_t written = fwrite(buffer, size, nmemb, (FILE *)stream);
  return written;
@@ -1433,7 +1433,7 @@ int opie_curl_fwrite(void *buffer, size_
 /*
  * opie_curl_strwrite
  */
-int opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_strwrite(void *buffer, size_t size, size_t nmemb, void *stream)
 {
  g_string_append_len((GString *)stream, buffer, size * nmemb);
  return size * nmemb;
@@ -1442,7 +1442,7 @@ int opie_curl_strwrite(void *buffer, siz
 /*
  * opie_curl_nullwrite
  */
-int opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_nullwrite(void *buffer, size_t size, size_t nmemb, void *stream)
 {
  return size * nmemb;
 }
@@ -1450,13 +1450,13 @@ int opie_curl_nullwrite(void *buffer, si
 /*
  * opie_curl_strread
  */
-int opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream)
+size_t opie_curl_strread(void *buffer, size_t size, size_t nmemb, void *stream)
 {
  char *str = ((char *)stream) + m_totalwritten;
  if(str[0] == '\0')
  return 0;
 
- int numbytes = strlen(str);
+ size_t numbytes = strlen(str);
  if(numbytes >= (nmemb * size))
  numbytes = (nmemb * size);
  memcpy(buffer, str, numbytes);

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Opensync-devel mailing list
Opensync-devel@...
https://lists.sourceforge.net/lists/listinfo/opensync-devel