Commit e4fa6c48 authored by Geoffroy Couprie's avatar 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 ebfd9455.
(cherry picked from commit 3ec93c14)

Conflicts:

	src/misc/update.c
parent 7dbdb79a
...@@ -1492,12 +1492,10 @@ static void* update_DownloadReal( vlc_object_t *p_this ); ...@@ -1492,12 +1492,10 @@ static void* update_DownloadReal( vlc_object_t *p_this );
* Download the file given in the update_t * Download the file given in the update_t
* *
* \param p_update structure * \param p_update structure
* \param destination to store the download file * \param dir to store the download file
* This can be an existing dir, a (non)existing target fullpath filename or
* NULL for the current working dir.
* \return nothing * \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 ); assert( p_update );
...@@ -1517,7 +1515,7 @@ void update_Download( update_t *p_update, const char *destination ) ...@@ -1517,7 +1515,7 @@ void update_Download( update_t *p_update, const char *destination )
p_udt->p_update = p_update; p_udt->p_update = p_update;
p_update->p_download = p_udt; 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_create( p_udt, "download update", update_DownloadReal,
VLC_THREAD_PRIORITY_LOW ); VLC_THREAD_PRIORITY_LOW );
...@@ -1543,7 +1541,7 @@ static void* update_DownloadReal( vlc_object_t *p_this ) ...@@ -1543,7 +1541,7 @@ static void* update_DownloadReal( vlc_object_t *p_this )
int canc; int canc;
update_t *p_update = p_udt->p_update; 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 ); msg_Dbg( p_udt, "Opening Stream '%s'", p_update->release.psz_url );
canc = vlc_savecancel (); canc = vlc_savecancel ();
...@@ -1731,11 +1729,12 @@ end: ...@@ -1731,11 +1729,12 @@ end:
stream_Delete( p_stream ); stream_Delete( p_stream );
if( p_file ) if( p_file )
fclose( p_file ); fclose( p_file );
free( psz_destdir );
free( psz_destfile ); free( psz_destfile );
free( p_buffer ); free( p_buffer );
free( psz_size ); free( psz_size );
free( p_udt->psz_destination );
p_udt->p_update->p_download = NULL; p_udt->p_update->p_download = NULL;
vlc_object_release( p_udt ); vlc_object_release( p_udt );
......
...@@ -149,7 +149,7 @@ typedef struct ...@@ -149,7 +149,7 @@ typedef struct
{ {
VLC_COMMON_MEMBERS VLC_COMMON_MEMBERS
update_t *p_update; update_t *p_update;
char *psz_destination; char *psz_destdir;
} update_download_thread_t; } update_download_thread_t;
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment