[002/250] Remove pointless #undefs of previously forbidden functions.

Message ID 1354401337-7312-3-git-send-email-anton@khirnov.net
State Committed
Commit cb45553f577f8e0ebfe05d3287e1b6fa5859b967
Headers show

Commit Message

Anton Khirnov Dec. 1, 2012, 10:31 p.m.
---
 libavcodec/golomb-test.c     |    1 -
 libavcodec/iirfilter.c       |    1 -
 libavcodec/libfaac.c         |    2 --
 libavdevice/libcdio.c        |    3 ---
 libavdevice/libdc1394.c      |    2 --
 libavdevice/timefilter.c     |    2 --
 libavfilter/filtfmts.c       |    3 ---
 libavfilter/vf_drawtext.c    |    2 --
 libavformat/network.c        |    2 --
 libavformat/output-example.c |    2 --
 libavformat/seek-test.c      |    3 ---
 libavformat/url-test.c       |    3 ---
 libavformat/utils.c          |    2 --
 libavutil/avstring.c         |    1 -
 libavutil/base64.c           |    2 --
 libavutil/blowfish.c         |    2 --
 libavutil/cpu.c              |    1 -
 libavutil/crc.c              |    1 -
 libavutil/des.c              |    3 ---
 libavutil/eval.c             |    1 -
 libavutil/fifo.c             |    2 --
 libavutil/log.c              |    2 --
 libavutil/md5.c              |    1 -
 libavutil/mem.c              |    5 -----
 libavutil/opt.c              |    2 --
 libavutil/parseutils.c       |    3 ---
 libavutil/sha.c              |    1 -
 libavutil/xtea.c             |    2 --
 28 files changed, 57 deletions(-)

Comments

Mans Rullgard Dec. 1, 2012, 11:12 p.m. | #1
Anton Khirnov <anton@khirnov.net> writes:

> ---
>  libavcodec/golomb-test.c     |    1 -
>  libavcodec/iirfilter.c       |    1 -
>  libavcodec/libfaac.c         |    2 --
>  libavdevice/libcdio.c        |    3 ---
>  libavdevice/libdc1394.c      |    2 --
>  libavdevice/timefilter.c     |    2 --
>  libavfilter/filtfmts.c       |    3 ---
>  libavfilter/vf_drawtext.c    |    2 --
>  libavformat/network.c        |    2 --
>  libavformat/output-example.c |    2 --
>  libavformat/seek-test.c      |    3 ---
>  libavformat/url-test.c       |    3 ---
>  libavformat/utils.c          |    2 --
>  libavutil/avstring.c         |    1 -
>  libavutil/base64.c           |    2 --
>  libavutil/blowfish.c         |    2 --
>  libavutil/cpu.c              |    1 -
>  libavutil/crc.c              |    1 -
>  libavutil/des.c              |    3 ---
>  libavutil/eval.c             |    1 -
>  libavutil/fifo.c             |    2 --
>  libavutil/log.c              |    2 --
>  libavutil/md5.c              |    1 -
>  libavutil/mem.c              |    5 -----
>  libavutil/opt.c              |    2 --
>  libavutil/parseutils.c       |    3 ---
>  libavutil/sha.c              |    1 -
>  libavutil/xtea.c             |    2 --
>  28 files changed, 57 deletions(-)

LGTM

Patch

diff --git a/libavcodec/golomb-test.c b/libavcodec/golomb-test.c
index bc90f36..e740a20 100644
--- a/libavcodec/golomb-test.c
+++ b/libavcodec/golomb-test.c
@@ -25,7 +25,6 @@ 
 #include "golomb.h"
 #include "put_bits.h"
 
-#undef fprintf
 #define COUNT 8191
 #define SIZE (COUNT * 4)
 
diff --git a/libavcodec/iirfilter.c b/libavcodec/iirfilter.c
index f9b9ff6..acfa904 100644
--- a/libavcodec/iirfilter.c
+++ b/libavcodec/iirfilter.c
@@ -312,7 +312,6 @@  av_cold void ff_iir_filter_free_coeffs(struct FFIIRFilterCoeffs *coeffs)
 }
 
 #ifdef TEST
-#undef printf
 #include <stdio.h>
 
 #define FILT_ORDER 4
diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c
index 24f3bf2..745fee2 100644
--- a/libavcodec/libfaac.c
+++ b/libavcodec/libfaac.c
@@ -159,9 +159,7 @@  static av_cold int Faac_encode_init(AVCodecContext *avctx)
             memcpy(avctx->extradata, buffer, avctx->extradata_size);
             faac_cfg->outputFormat = 0;
         }
-#undef free
         free(buffer);
-#define free please_use_av_free
     }
 
     if (!faacEncSetConfiguration(s->faac_handle, faac_cfg)) {
diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c
index a82ad67..e846ee6 100644
--- a/libavdevice/libcdio.c
+++ b/libavdevice/libcdio.c
@@ -33,9 +33,6 @@ 
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 
-/* cdio returns some malloced strings that need to be free()d */
-#undef free
-
 typedef struct CDIOContext {
     AVClass             *class;
     cdrom_drive_t       *drive;
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index d953e12..f030e3e 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -48,8 +48,6 @@ 
 #define DC1394_FRAMERATE_240   FRAMERATE_240
 #endif
 
-#undef free
-
 typedef struct dc1394_data {
     AVClass *class;
 #if HAVE_LIBDC1394_1
diff --git a/libavdevice/timefilter.c b/libavdevice/timefilter.c
index 8f52fc5..8b98d33 100644
--- a/libavdevice/timefilter.c
+++ b/libavdevice/timefilter.c
@@ -78,8 +78,6 @@  double ff_timefilter_update(TimeFilter *self, double system_time, double period)
 #include "libavutil/lfg.h"
 #define LFG_MAX ((1LL << 32) - 1)
 
-#undef printf
-
 int main(void)
 {
     AVLFG prng;
diff --git a/libavfilter/filtfmts.c b/libavfilter/filtfmts.c
index 3ec8116..480b277 100644
--- a/libavfilter/filtfmts.c
+++ b/libavfilter/filtfmts.c
@@ -25,9 +25,6 @@ 
 #include "libavfilter/avfilter.h"
 #include "libavfilter/formats.h"
 
-#undef fprintf
-#undef printf
-
 int main(int argc, char **argv)
 {
     AVFilter *filter;
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index e1c2bb1..f8800d2 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -46,8 +46,6 @@ 
 #include "internal.h"
 #include "video.h"
 
-#undef time
-
 #include <ft2build.h>
 #include <freetype/config/ftheader.h>
 #include FT_FREETYPE_H
diff --git a/libavformat/network.c b/libavformat/network.c
index fe17bdf..1f6bc10 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -57,8 +57,6 @@  static unsigned long openssl_thread_id(void)
 #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
 #include <gcrypt.h>
 #include <errno.h>
-#undef malloc
-#undef free
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #endif
 #endif
diff --git a/libavformat/output-example.c b/libavformat/output-example.c
index e4babb4..2f83990 100644
--- a/libavformat/output-example.c
+++ b/libavformat/output-example.c
@@ -38,8 +38,6 @@ 
 #include "libavformat/avformat.h"
 #include "libswscale/swscale.h"
 
-#undef exit
-
 /* 5 seconds stream duration */
 #define STREAM_DURATION   5.0
 #define STREAM_FRAME_RATE 25 /* 25 images/s */
diff --git a/libavformat/seek-test.c b/libavformat/seek-test.c
index 57d3fa4..143f0b5 100644
--- a/libavformat/seek-test.c
+++ b/libavformat/seek-test.c
@@ -28,9 +28,6 @@ 
 #include "libavutil/mathematics.h"
 #include "libavformat/avformat.h"
 
-#undef printf
-#undef fprintf
-
 static char buffer[20];
 
 static const char *ret_str(int v)
diff --git a/libavformat/url-test.c b/libavformat/url-test.c
index 58258e5..6639ccf 100644
--- a/libavformat/url-test.c
+++ b/libavformat/url-test.c
@@ -20,9 +20,6 @@ 
 
 #include "internal.h"
 
-#undef printf
-#undef exit
-
 static void test(const char *base, const char *rel)
 {
     char buf[200], buf2[200];
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 481760b..12b054d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3092,7 +3092,6 @@  static void hex_dump_internal(void *avcl, FILE *f, int level,
                               const uint8_t *buf, int size)
 {
     int len, i, j, c;
-#undef fprintf
 #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
 
     for(i=0;i<size;i+=16) {
@@ -3130,7 +3129,6 @@  void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size)
 
 static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int dump_payload, AVRational time_base)
 {
-#undef fprintf
 #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
     PRINT("stream #%d:\n", pkt->stream_index);
     PRINT("  keyframe=%d\n", ((pkt->flags & AV_PKT_FLAG_KEY) != 0));
diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 6b3a65c..c14832e 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -159,7 +159,6 @@  int av_strncasecmp(const char *a, const char *b, size_t n)
 #ifdef TEST
 
 #include "common.h"
-#undef printf
 
 int main(void)
 {
diff --git a/libavutil/base64.c b/libavutil/base64.c
index c1fba89..d16195f 100644
--- a/libavutil/base64.c
+++ b/libavutil/base64.c
@@ -101,8 +101,6 @@  char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size)
 
 #ifdef TEST
 
-#undef printf
-
 #define MAX_DATA_SIZE    1024
 #define MAX_ENCODED_SIZE 2048
 
diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c
index e6f07d6..63cc404 100644
--- a/libavutil/blowfish.c
+++ b/libavutil/blowfish.c
@@ -428,7 +428,6 @@  void av_blowfish_crypt(AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
 
 #ifdef TEST
 #include <stdio.h>
-#undef printf
 
 #define NUM_VARIABLE_KEY_TESTS 34
 
@@ -531,7 +530,6 @@  static const uint8_t ciphertext2[16] = {
 
 #define IV "blowfish"
 
-#undef exit
 static void test_blowfish(AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
                           const uint8_t *ref, int len, uint8_t *iv, int dir,
                           const char *test)
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 8db69be..23016d6 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -111,7 +111,6 @@  int av_parse_cpu_flags(const char *s)
 
 #ifdef TEST
 
-#undef printf
 #include <stdio.h>
 
 static const struct {
diff --git a/libavutil/crc.c b/libavutil/crc.c
index 47520e5..3d1d876 100644
--- a/libavutil/crc.c
+++ b/libavutil/crc.c
@@ -113,7 +113,6 @@  uint32_t av_crc(const AVCRC *ctx, uint32_t crc,
 }
 
 #ifdef TEST
-#undef printf
 int main(void)
 {
     uint8_t buf[1999];
diff --git a/libavutil/des.c b/libavutil/des.c
index c7c6f1d..01cb10b 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -337,9 +337,6 @@  void av_des_mac(AVDES *d, uint8_t *dst, const uint8_t *src, int count) {
 }
 
 #ifdef TEST
-#undef printf
-#undef rand
-#undef srand
 #include <stdlib.h>
 #include <stdio.h>
 #include "libavutil/time.h"
diff --git a/libavutil/eval.c b/libavutil/eval.c
index 7a28dbe..7887cf6 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -545,7 +545,6 @@  int av_expr_parse_and_eval(double *d, const char *s,
 }
 
 #ifdef TEST
-#undef printf
 #include <string.h>
 
 static const double const_values[] = {
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 5774d33..2684899 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -130,8 +130,6 @@  void av_fifo_drain(AVFifoBuffer *f, int size)
 
 #ifdef TEST
 
-#undef printf
-
 int main(void)
 {
     /* create a FIFO buffer */
diff --git a/libavutil/log.c b/libavutil/log.c
index 45c649a..8012976 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -55,7 +55,6 @@  static const uint8_t color[] = { 0x41, 0x41, 0x11, 0x03, 9, 0x02, 0x06 };
 #endif
 static int use_color = -1;
 
-#undef fprintf
 static void colored_fputs(int level, const char *str)
 {
     if (use_color < 0) {
@@ -104,7 +103,6 @@  void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
     if (level > av_log_level)
         return;
     line[0] = 0;
-#undef fprintf
     if (print_prefix && avc) {
         if (avc->parent_log_context_offset) {
             AVClass** parent = *(AVClass ***) (((uint8_t *) ptr) +
diff --git a/libavutil/md5.c b/libavutil/md5.c
index 93a91d7..efb993e 100644
--- a/libavutil/md5.c
+++ b/libavutil/md5.c
@@ -182,7 +182,6 @@  void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len)
 }
 
 #ifdef TEST
-#undef printf
 #include <stdio.h>
 
 static void print_md5(uint8_t *md5)
diff --git a/libavutil/mem.c b/libavutil/mem.c
index b6c0b29..3a4433d 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -38,11 +38,6 @@ 
 #include "intreadwrite.h"
 #include "mem.h"
 
-/* here we can use OS-dependent allocation functions */
-#undef free
-#undef malloc
-#undef realloc
-
 #ifdef MALLOC_PREFIX
 
 #define malloc         AV_JOIN(MALLOC_PREFIX, malloc)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 61a72d0..d2cb9ef 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -685,8 +685,6 @@  const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *pre
 
 #ifdef TEST
 
-#undef printf
-
 typedef struct TestContext
 {
     const AVClass *class;
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index 28aa9c9..917451e 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -498,7 +498,6 @@  int av_parse_time(int64_t *timeval, const char *timestr, int duration)
     char lastch;
     int negative = 0;
 
-#undef time
     time_t now = time(0);
 
     len = strlen(timestr);
@@ -643,8 +642,6 @@  int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info
 
 #ifdef TEST
 
-#undef printf
-
 int main(void)
 {
     printf("Testing av_parse_video_rate()\n");
diff --git a/libavutil/sha.c b/libavutil/sha.c
index d583191..c7c6ce3 100644
--- a/libavutil/sha.c
+++ b/libavutil/sha.c
@@ -334,7 +334,6 @@  void av_sha_final(AVSHA* ctx, uint8_t *digest)
 
 #ifdef TEST
 #include <stdio.h>
-#undef printf
 
 int main(void)
 {
diff --git a/libavutil/xtea.c b/libavutil/xtea.c
index f3357ce..1187662 100644
--- a/libavutil/xtea.c
+++ b/libavutil/xtea.c
@@ -101,7 +101,6 @@  void av_xtea_crypt(AVXTEA *ctx, uint8_t *dst, const uint8_t *src, int count,
 
 #ifdef TEST
 #include <stdio.h>
-#undef printf
 
 #define XTEA_NUM_TESTS 6
 
@@ -138,7 +137,6 @@  static const uint8_t xtea_test_ct[XTEA_NUM_TESTS][8] = {
     { 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41 }
 };
 
-#undef exit
 static void test_xtea(AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
                       const uint8_t *ref, int len, uint8_t *iv, int dir,
                       const char *test)