[xine-cvs] CVS: xine-ui/src/xitk download.c,1.13,1.14

[Hans-Dieter K. <fs...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7101

Modified Files:
	download.c 
Log Message:
Added error return for failed curl_easy_init().
Removed needless memset() before snprintf(). Code cleanup.


Index: download.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/download.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- download.c	26 Apr 2004 21:31:44 -0000	1.13
+++ download.c	25 Mar 2007 23:22:17 -0000	1.14
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2004 the xine project
+ * Copyright (C) 2000-2007 the xine project
  * 
  * This file is part of xine, a unix video player.
  * 
@@ -54,7 +54,6 @@
   int          percent = (dltotal > 0.0) ? (int) (dlnow * 100.0 / dltotal) : 0;
   
   osd_draw_bar(_("Download in progress"), 0, 100, percent, OSD_BAR_POS);
-  memset(&buffer, 0, sizeof(buffer));
   snprintf(buffer, sizeof(buffer), _("Download progress: %d%%."), percent);
   gGui->mrl_overrided = 3;
   panel_set_title(buffer);
@@ -87,7 +86,6 @@
 int network_download(const char *url, download_t *download) {
 #ifdef HAVE_CURL
   CURL        *curl;
-  CURLcode     res;
 
   pthread_mutex_lock(&gGui->download_mutex);
 
@@ -99,7 +97,6 @@
     
     memset(&error_buffer, 0, sizeof(error_buffer));
     
-    memset(&user_agent, 0, sizeof(user_agent));
     snprintf(user_agent, sizeof(user_agent), "User-Agent: xine/%s", VERSION);
     
     curl_easy_setopt(curl, CURLOPT_VERBOSE, 
@@ -127,13 +124,17 @@
     
     curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &error_buffer);
     
-    if((res = curl_easy_perform(curl)) != 0) {
+    if(curl_easy_perform(curl)) {
       download->error = strdup((strlen(error_buffer)) ? error_buffer : "Unknown error");
       download->status = 1;
     }
     
     curl_easy_cleanup(curl);
   }
+  else {
+    download->error = strdup("Cannot initialize");
+    download->status = 1;
+  }
   
   curl_global_cleanup();