[SCM] libquicktime/master: Remove 12-dont_use_pathmax.patch, it hasn't been useful.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Jul 9 08:24:50 UTC 2011
The following commit has been merged in the master branch:
commit 1b27c26789a6d676cb203a1eaae293c749c4e3fa
Author: Alessio Treglia <alessio at debian.org>
Date: Sat Jul 9 10:24:38 2011 +0200
Remove 12-dont_use_pathmax.patch, it hasn't been useful.
diff --git a/debian/patches/12-dont_use_pathmax.patch b/debian/patches/12-dont_use_pathmax.patch
deleted file mode 100644
index 4fac1aa..0000000
--- a/debian/patches/12-dont_use_pathmax.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Author: Alessio Treglia <alessio at debian.org>
-Description: Avoid unconditionalized use of PATH_MAX to fix FTBFS on hurd.
-Forwarded: Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
----
- src/lqt_codecfile.c | 11 ++++++++++-
- src/lqt_codecinfo.c | 3 +--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
---- libquicktime.orig/src/lqt_codecfile.c
-+++ libquicktime/src/lqt_codecfile.c
-@@ -143,7 +143,7 @@ static const char * video_order_key = "V
-
- #define CHECK_KEYWORD(key) (!strncmp(line, key, strlen(key)))
-
--static char filename_buffer[PATH_MAX];
-+static char * filename_buffer = NULL;
-
- static void create_filename()
- {
-@@ -164,11 +164,15 @@ static void create_filename()
- if(!fdir)
- return;
-
-+ filename_buffer = malloc(strlen(fdir) + 22);
- strcpy(filename_buffer, fdir);
- strcat(filename_buffer, "/.libquicktime_codecs");
-
- } else
-+ {
-+ filename_buffer = malloc(strlen(fdir) + 1);
- strcpy(filename_buffer, fdir);
-+ }
-
-
- }
-@@ -1057,6 +1061,9 @@ void lqt_registry_write()
- }
- fclose(output);
- lqt_registry_unlock();
-+ if (filename_buffer) {
-+ free(filename_buffer);
-+ }
-
- return;
- fail:
-@@ -1066,4 +1073,6 @@ fail:
- lqt_log(NULL, LQT_LOG_INFO, LOG_DOMAIN,
- "%s could not be written, deleting imcomplete file", filename_buffer);
- remove(filename_buffer);
-+ if (filename_buffer)
-+ { free(filename_buffer); }
- }
---- libquicktime.orig/src/lqt_codecinfo.c
-+++ libquicktime/src/lqt_codecinfo.c
-@@ -611,8 +611,6 @@ static int scan_for_plugins(const char *
- lqt_codec_info_t * video_codecs_end;
- lqt_codec_info_t * audio_codecs_end;
-
-- filename = malloc(PATH_MAX * sizeof(char));
--
- /* Set the end pointers so we can quickly add codecs after */
-
-
-@@ -662,6 +660,7 @@ static int scan_for_plugins(const char *
-
- /* Now, the file should be a valid plugin, construct the filename */
-
-+ filename = malloc(strlen(plugin_dir) + strlen(directory_entry->d_name) + 2);
- strcpy(filename, plugin_dir);
- strcat(filename, "/");
- strcat(filename, directory_entry->d_name);
--
libquicktime packaging
More information about the pkg-multimedia-commits
mailing list