[vlc-devel] commit: Revert "update: rename the variables so that it matches their current purpose" ( Geoffroy Couprie )

[git version control]

vlc | branch: 1.0-bugfix | Geoffroy Couprie <geal at videolan.org> | Fri Sep 11 22:48:12 2009 +0200| [e4fa6c48c94b69ca9a5c8527c10051f429f266d7] | committer: Geoffroy Couprie 

Revert "update: rename the variables so that it matches their current purpose"

Try again to fix the Win32 update code and make buildbot happy.

This reverts commit ebfd94553ab7b18a436a14f42453cc3302caf471.
(cherry picked from commit 3ec93c14a68cc3c8a655af7e6348d82e5f5d678d)

Conflicts:

	src/misc/update.c

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e4fa6c48c94b69ca9a5c8527c10051f429f266d7
---

 src/misc/update.c |   13 ++++++-------
 src/misc/update.h |    2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/misc/update.c b/src/misc/update.c
index b31cb34..a0f4334 100644
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -1492,12 +1492,10 @@ static void* update_DownloadReal( vlc_object_t *p_this );
  * Download the file given in the update_t
  *
  * \param p_update structure
- * \param destination to store the download file
- *        This can be an existing dir, a (non)existing target fullpath filename or
- *        NULL for the current working dir.
+ * \param dir to store the download file
  * \return nothing
  */
-void update_Download( update_t *p_update, const char *destination )
+void update_Download( update_t *p_update, const char *psz_destdir )
 {
     assert( p_update );
 
@@ -1517,7 +1515,7 @@ void update_Download( update_t *p_update, const char *destination )
 
     p_udt->p_update = p_update;
     p_update->p_download = p_udt;
-    p_udt->psz_destination = destination ? strdup( destination ) : NULL;
+    p_udt->psz_destdir = psz_destdir ? strdup( psz_destdir ) : NULL;
 
     vlc_thread_create( p_udt, "download update", update_DownloadReal,
                        VLC_THREAD_PRIORITY_LOW );
@@ -1543,7 +1541,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
     int canc;
 
     update_t *p_update = p_udt->p_update;
-    char *psz_destination = p_udt->psz_destination;
+    char *psz_destdir = p_udt->psz_destdir;
 
     msg_Dbg( p_udt, "Opening Stream '%s'", p_update->release.psz_url );
     canc = vlc_savecancel ();
@@ -1731,11 +1729,12 @@ end:
         stream_Delete( p_stream );
     if( p_file )
         fclose( p_file );
+
+    free( psz_destdir );
     free( psz_destfile );
     free( p_buffer );
     free( psz_size );
 
-    free( p_udt->psz_destination );
     p_udt->p_update->p_download = NULL;
 
     vlc_object_release( p_udt );
diff --git a/src/misc/update.h b/src/misc/update.h
index 59ac20a..c092cf5 100644
--- a/src/misc/update.h
+++ b/src/misc/update.h
@@ -149,7 +149,7 @@ typedef struct
 {
     VLC_COMMON_MEMBERS
     update_t *p_update;
-    char *psz_destination;
+    char *psz_destdir;
 } update_download_thread_t;
 
 /**