From 2db5da97e2b230ccaede57e4f91cf009f52f2f99 Mon Sep 17 00:00:00 2001
From: Ramiro Polla <ramiro.polla@gmail.com>
Date: Wed, 4 Feb 2009 05:56:39 +0000
Subject: [PATCH] Do not misuse unsigned long to store pointers.
Originally committed as revision 16986 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/avformat.h | 6 +++---
libavformat/cutils.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index d7c457b9053..be1ec1c24ac 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1197,7 +1197,7 @@ int avf_sdp_create(AVFormatContext *ac[], int n_files, char *buff, int size);
#ifdef HAVE_AV_CONFIG_H
-void ff_dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem);
+void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem);
#ifdef __GNUC__
#define dynarray_add(tab, nb_ptr, elem)\
@@ -1205,12 +1205,12 @@ do {\
__typeof__(tab) _tab = (tab);\
__typeof__(elem) _elem = (elem);\
(void)sizeof(**_tab == _elem); /* check that types are compatible */\
- ff_dynarray_add((unsigned long **)_tab, nb_ptr, (unsigned long)_elem);\
+ ff_dynarray_add((intptr_t **)_tab, nb_ptr, (intptr_t)_elem);\
} while(0)
#else
#define dynarray_add(tab, nb_ptr, elem)\
do {\
- ff_dynarray_add((unsigned long **)(tab), nb_ptr, (unsigned long)(elem));\
+ ff_dynarray_add((intptr_t **)(tab), nb_ptr, (intptr_t)(elem));\
} while(0)
#endif
diff --git a/libavformat/cutils.c b/libavformat/cutils.c
index 42ef5996d99..4967d5b90c2 100644
--- a/libavformat/cutils.c
+++ b/libavformat/cutils.c
@@ -21,10 +21,10 @@
#include "avformat.h"
/* add one element to a dynamic array */
-void ff_dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem)
+void ff_dynarray_add(intptr_t **tab_ptr, int *nb_ptr, intptr_t elem)
{
int nb, nb_alloc;
- unsigned long *tab;
+ intptr_t *tab;
nb = *nb_ptr;
tab = *tab_ptr;
@@ -33,7 +33,7 @@ void ff_dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem)
nb_alloc = 1;
else
nb_alloc = nb * 2;
- tab = av_realloc(tab, nb_alloc * sizeof(unsigned long));
+ tab = av_realloc(tab, nb_alloc * sizeof(intptr_t));
*tab_ptr = tab;
}
tab[nb++] = elem;
--
GitLab