Removed '_' from the Header Guard definitions.

https://www.securecoding.cert.org/confluence/display/seccode/DCL37-C.+Do+not+declare+or+define+a+reserved+identifier#DCL37-C.Donotdeclareordefineareservedidentifier-NoncompliantCodeExample%28HeaderGuard%29
njh · Jan 4, 2012 · 3a78d27 · 3a78d27
1 parent 59486e2
commit 3a78d27
Show file tree

Hide file tree

Showing 23 changed files with 49 additions and 49 deletions.
diff --git a/libtwolame/ath.h b/libtwolame/ath.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef	_ATH_H_
+#ifndef TWOLAME_ATH_H
-#define	_ATH_H_
+#define TWOLAME_ATH_H
 
 FLOAT ath_db(FLOAT f, FLOAT value);
 FLOAT ath_energy(FLOAT f, FLOAT value);

diff --git a/libtwolame/availbits.h b/libtwolame/availbits.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef	_AVAILBITS_H_
+#ifndef TWOLAME_AVAILBITS_H
-#define	_AVAILBITS_H_
+#define TWOLAME_AVAILBITS_H
 
 int available_bits(twolame_options * glopts);
 

diff --git a/libtwolame/bitbuffer.h b/libtwolame/bitbuffer.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _BITBUFFER_H_
+#ifndef TWOLAME_BITBUFFER_H
-#define _BITBUFFER_H_
+#define TWOLAME_BITBUFFER_H
 
 #include "common.h"
 

diff --git a/libtwolame/common.h b/libtwolame/common.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _COMMON_H
+#ifndef TWOLAME_COMMON_H
-#define _COMMON_H
+#define TWOLAME_COMMON_H
 
 #ifdef _WIN32
 # include "../win32/configwin.h"
@@ -369,7 +369,7 @@ struct twolame_options_struct {
     int vbrstats[15];
 };
 
-#endif                          // _COMMON_H
+#endif                          // TWOLAME_COMMON_H
 
 
 // vim:ts=4:sw=4:nowrap: 
diff --git a/libtwolame/crc.h b/libtwolame/crc.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef	_CRC_H_
+#ifndef TWOLAME_CRC_H
-#define	_CRC_H_
+#define TWOLAME_CRC_H
 
 void crc_writeheader(unsigned char *bitstream, int bit_count);
 

diff --git a/libtwolame/dab.h b/libtwolame/dab.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef	_DAB_H_
+#ifndef TWOLAME_DAB_H
-#define	_DAB_H_
+#define TWOLAME_DAB_H
 
 void dab_crc_calc(twolame_options * glopts,
                   unsigned int bit_alloc[2][SBLIMIT],

diff --git a/libtwolame/encode.h b/libtwolame/encode.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef	_ENCODE_H_
+#ifndef TWOLAME_ENCODE_H
-#define	_ENCODE_H_
+#define TWOLAME_ENCODE_H
 
 int encode_init(twolame_options * glopts);
 

diff --git a/libtwolame/energy.h b/libtwolame/energy.h
@@ -24,8 +24,8 @@
  */
 
 
-#ifndef	_ENERGY_H_
+#ifndef TWOLAME_ENERGY_H
-#define	_ENERGY_H_
+#define TWOLAME_ENERGY_H
 
 int get_required_energy_bits(twolame_options * glopts);
 void do_energy_levels(twolame_options * glopts, bit_stream * bs);

diff --git a/libtwolame/fft.h b/libtwolame/fft.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef	_FFT_H_
+#ifndef TWOLAME_FFT_H
-#define	_FFT_H_
+#define TWOLAME_FFT_H
 
 //void fft (FLOAT[BLKSIZE], FLOAT[BLKSIZE], FLOAT[BLKSIZE], FLOAT[BLKSIZE], int);
 

diff --git a/libtwolame/mem.h b/libtwolame/mem.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _MEM_H
+#ifndef TWOLAME_MEM_H
-#define _MEM_H
+#define TWOLAME_MEM_H
 
 
 #include "common.h"

diff --git a/libtwolame/psycho_0.h b/libtwolame/psycho_0.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef	_PSYCHO_0_H_
+#ifndef TWOLAME_PSYCHO_0_H
-#define	_PSYCHO_0_H_
+#define TWOLAME_PSYCHO_0_H
 
 void psycho_0(twolame_options * glopts, FLOAT SMR[2][SBLIMIT], unsigned int scalar[2][3][SBLIMIT]);
 void psycho_0_deinit(psycho_0_mem ** mem);

diff --git a/libtwolame/psycho_1.h b/libtwolame/psycho_1.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef	_PSYCHO_1_H_
+#ifndef TWOLAME_PSYCHO_1_H
-#define	_PSYCHO_1_H_
+#define TWOLAME_PSYCHO_1_H
 
 void psycho_1(twolame_options * glopts, short int buffer[2][1152], FLOAT scale[2][32],
               FLOAT ltmin[2][32]);

diff --git a/libtwolame/psycho_1_critband.h b/libtwolame/psycho_1_critband.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _CRITBAND_H_
+#ifndef TWOLAME_CRITBAND_H
-#define _CRITBAND_H_
+#define TWOLAME_CRITBAND_H
 
 static const int SecondCriticalBand[7][28] = {
     {

diff --git a/libtwolame/psycho_1_freqtable.h b/libtwolame/psycho_1_freqtable.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _FREQTABLE_H
+#ifndef TWOLAME_FREQTABLE_H
-#define _FREQTABLE_H
+#define TWOLAME_FREQTABLE_H
 
 typedef struct {
     int line;

diff --git a/libtwolame/psycho_2.h b/libtwolame/psycho_2.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef	_PSYCHO_2_H_
+#ifndef TWOLAME_PSYCHO_2_H
-#define	_PSYCHO_2_H_
+#define TWOLAME_PSYCHO_2_H
 
 psycho_2_mem *psycho_2_init(twolame_options * glopts, int sfreq);
 void psycho_2(twolame_options * glopts, short int buffer[2][1152], short int savebuf[2][1056],

diff --git a/libtwolame/psycho_2_absthr.h b/libtwolame/psycho_2_absthr.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef _ABSTHR_H_
+#ifndef TWOLAME_ABSTHR_H
-#define _ABSTHR_H_
+#define TWOLAME_ABSTHR_H
 
 static const FLOAT absthr_table[4][HBLKSIZE] = {
     {

diff --git a/libtwolame/psycho_3.h b/libtwolame/psycho_3.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef	_PSYCHO_3_H_
+#ifndef TWOLAME_PSYCHO_3_H
-#define	_PSYCHO_3_H_
+#define TWOLAME_PSYCHO_3_H
 
 void psycho_3(twolame_options * glopts, short int buffer[2][1152], FLOAT scale[2][32],
               FLOAT ltmin[2][32]);

diff --git a/libtwolame/psycho_4.h b/libtwolame/psycho_4.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef	_PSYCHO_4_H_
+#ifndef TWOLAME_PSYCHO_4_H
-#define	_PSYCHO_4_H_
+#define TWOLAME_PSYCHO_4_H
 
 void psycho_4(twolame_options * glopts, short int buffer[2][1152], short int savebuf[2][1056],
               FLOAT smr[2][32]);

diff --git a/libtwolame/psycho_n1.h b/libtwolame/psycho_n1.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef	_PSYCHO_N1_H_
+#ifndef TWOLAME_PSYCHO_N1_H
-#define	_PSYCHO_N1_H_
+#define TWOLAME_PSYCHO_N1_H
 
 void psycho_n1(twolame_options * glopts, FLOAT ltmin[2][SBLIMIT], int stereo);
 

diff --git a/libtwolame/subband.h b/libtwolame/subband.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef	_SUBBAND_H_
+#ifndef TWOLAME_SUBBAND_H
-#define	_SUBBAND_H_
+#define TWOLAME_SUBBAND_H
 
 int init_subband(subband_mem * smem);
 void window_filter_subband(subband_mem * smem, short *pBuffer, int ch, FLOAT s[SBLIMIT]);

diff --git a/libtwolame/twolame.h b/libtwolame/twolame.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __TWOLAME_H__
+#ifndef TWOLAME_H
-#define __TWOLAME_H__
+#define TWOLAME_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -919,5 +919,5 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif                          /* _TWOLAME_H_ */
+#endif                          /* TWOLAME_H */
 // vim:ts=4:sw=4:nowrap:
diff --git a/libtwolame/util.h b/libtwolame/util.h
@@ -23,16 +23,16 @@
  */
 
 
-#ifndef	_UTIL_H_
+#ifndef TWOLAME_UTIL_H
-#define	_UTIL_H_
+#define TWOLAME_UTIL_H
 
 /* non-public prototypes */
 const char *twolame_mpeg_version_name(int version);
 int twolame_get_bitrate_index(int bitrate, TWOLAME_MPEG_version version);
 int twolame_get_samplerate_index(long sample_rate);
 int twolame_get_version_for_samplerate(long sample_rate);
 
-#endif                          /* _UTIL_H_ */
+#endif                          /* TWOLAME_UTIL_H_ */
 
 
 // vim:ts=4:sw=4:nowrap: 
diff --git a/win32/winutil.h b/win32/winutil.h
@@ -1,5 +1,5 @@
-#ifndef __TWOLAME_WINUTIL_H
+#ifndef TWOLAME_WINUTIL_H
-#define __TWOLAME_WINUTIL_H
+#define TWOLAME_WINUTIL_H
 
 /*
  * Don't define this as a function to avoid conflicts