Bug cmus#177: Include guards became consistent.

Some include guards did not fit to the expected naming convention of the C language standard. https://www.securecoding.cert.org/confluence/display/seccode/DCL37-C.+Do+not+declare+or+define+a+reserved+identifier This detail was fixed by the addition of the project name as a prefix. Signed-off-by: Markus Elfring <[email protected]>
VladislavGrudinin · Sep 5, 2014 · aacf178 · aacf178
1 parent cf2563b
commit aacf178
Show file tree

Hide file tree

Showing 67 changed files with 134 additions and 135 deletions.
diff --git a/aac.h b/aac.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _AAC_H
-#define _AAC_H
+#ifndef CMUS_AAC_H
+#define CMUS_AAC_H
 
 #include "channelmap.h"
 #include <neaacdec.h>

diff --git a/ape.h b/ape.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _APE_H
-#define _APE_H
+#ifndef CMUS_APE_H
+#define CMUS_APE_H
 
 #include <stdint.h>
 #include <stdlib.h>

diff --git a/browser.h b/browser.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _BROWSER_H
-#define _BROWSER_H
+#ifndef CMUS_BROWSER_H
+#define CMUS_BROWSER_H
 
 #include "list.h"
 #include "window.h"

diff --git a/buffer.h b/buffer.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _BUFFER_H
-#define _BUFFER_H
+#ifndef CMUS_BUFFER_H
+#define CMUS_BUFFER_H
 
 /* must be a multiple of any supported frame size */
 #define CHUNK_SIZE (60 * 1024)

diff --git a/cache.h b/cache.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CACHE_H
-#define CACHE_H
+#ifndef CMUS_CACHE_H
+#define CMUS_CACHE_H
 
 #include "track_info.h"
 #include "locking.h"

diff --git a/channelmap.h b/channelmap.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _CHANNELMAP_H
-#define _CHANNELMAP_H
+#ifndef CMUS_CHANNELMAP_H
+#define CMUS_CHANNELMAP_H
 
 #include <string.h>
 

diff --git a/cmus.h b/cmus.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _CMUS_H
-#define _CMUS_H
+#ifndef CMUS_API_H
+#define CMUS_API_H
 
 #include "track_info.h"
 

diff --git a/command_mode.h b/command_mode.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _COMMAND_MODE_H
-#define _COMMAND_MODE_H
+#ifndef CMUS_COMMAND_MODE_H
+#define CMUS_COMMAND_MODE_H
 
 #include "uchar.h"
 

diff --git a/comment.h b/comment.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _COMMENT_H
-#define _COMMENT_H
+#ifndef CMUS_COMMENT_H
+#define CMUS_COMMENT_H
 
 #include "keyval.h"
 

diff --git a/compiler.h b/compiler.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef COMPILER_H
-#define COMPILER_H
+#ifndef CMUS_COMPILER_H
+#define CMUS_COMPILER_H
 
 #include <stddef.h>
 

diff --git a/convert.h b/convert.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONVERT_H
-#define CONVERT_H
+#ifndef CMUS_CONVERT_H
+#define CMUS_CONVERT_H
 
 #include <sys/types.h> /* ssize_t */
 

diff --git a/cue_utils.h b/cue_utils.h
@@ -16,9 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#ifndef __CUE_UTILS_H__
-#define __CUE_UTILS_H__
+#ifndef CMUS_CUE_UTILS_H
+#define CMUS_CUE_UTILS_H
 
 #include <stdio.h>
 

diff --git a/debug.h b/debug.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef CMUS_DEBUG_H
+#define CMUS_DEBUG_H
 
 #include "compiler.h"
 #ifdef HAVE_CONFIG

diff --git a/discid.h b/discid.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _DISCID_H
-#define _DISCID_H
+#ifndef CMUS_DISCID_H
+#define CMUS_DISCID_H
 
 char *get_default_cdda_device(void);
 int parse_cdda_url(const char *url, char **disc_id, int *start_track, int *end_track);

diff --git a/editable.h b/editable.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EDITABLE_H
-#define EDITABLE_H
+#ifndef CMUS_EDITABLE_H
+#define CMUS_EDITABLE_H
 
 #include "window.h"
 #include "list.h"

diff --git a/expr.h b/expr.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EXPR_H
-#define EXPR_H
+#ifndef CMUS_EXPR_H
+#define CMUS_EXPR_H
 
 #include "track_info.h"
 #include "list.h"

diff --git a/file.h b/file.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _FILE_H
-#define _FILE_H
+#ifndef CMUS_FILE_H
+#define CMUS_FILE_H
 
 #include <stddef.h> /* size_t */
 #include <sys/types.h> /* ssize_t */

diff --git a/filters.h b/filters.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FILTERS_H
-#define FILTERS_H
+#ifndef CMUS_FILTERS_H
+#define CMUS_FILTERS_H
 
 #include "list.h"
 #include "window.h"

diff --git a/format_print.h b/format_print.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _FORMAT_PRINT_H
-#define _FORMAT_PRINT_H
+#ifndef CMUS_FORMAT_PRINT_H
+#define CMUS_FORMAT_PRINT_H
 
 #include "gbuf.h"
 

diff --git a/gbuf.h b/gbuf.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GBUF_H
-#define GBUF_H
+#ifndef CMUS_GBUF_H
+#define CMUS_GBUF_H
 
 #include "compiler.h"
 

diff --git a/glob.h b/glob.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GLOB_H
-#define GLOB_H
+#ifndef CMUS_GLOB_H
+#define CMUS_GLOB_H
 
 #include "list.h"
 

diff --git a/help.h b/help.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef HELP_H
-#define HELP_H
+#ifndef CMUS_HELP_H
+#define CMUS_HELP_H
 
 #include "list.h"
 #include "window.h"

diff --git a/history.h b/history.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _HISTORY_H
-#define _HISTORY_H
+#ifndef CMUS_HISTORY_H
+#define CMUS_HISTORY_H
 
 #include "list.h"
 

diff --git a/http.h b/http.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _HTTP_H
-#define _HTTP_H
+#ifndef CMUS_HTTP_H
+#define CMUS_HTTP_H
 
 #include "keyval.h"
 

diff --git a/id3.h b/id3.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _ID3_H
-#define _ID3_H
+#ifndef CMUS_ID3_H
+#define CMUS_ID3_H
 
 #include <stdint.h>
 

diff --git a/input.h b/input.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _INPUT_H
-#define _INPUT_H
+#ifndef CMUS_INPUT_H
+#define CMUS_INPUT_H
 
 #include "keyval.h"
 #include "sf.h"

diff --git a/ip.h b/ip.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _IP_H
-#define _IP_H
+#ifndef CMUS_IP_H
+#define CMUS_IP_H
 
 #include "keyval.h"
 #include "sf.h"

diff --git a/iter.h b/iter.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _ITER_H
-#define _ITER_H
+#ifndef CMUS_ITER_H
+#define CMUS_ITER_H
 
 #include <stddef.h> /* NULL */
 

diff --git a/job.h b/job.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef JOB_H
-#define JOB_H
+#ifndef CMUS_JOB_H
+#define CMUS_JOB_H
 
 #include "cmus.h"
 

diff --git a/keys.h b/keys.h
@@ -18,8 +18,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEYS_H
-#define KEYS_H
+#ifndef CMUS_KEYS_H
+#define CMUS_KEYS_H
 
 #include "uchar.h"
 

diff --git a/keyval.h b/keyval.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEYVAL_H
-#define KEYVAL_H
+#ifndef CMUS_KEYVAL_H
+#define CMUS_KEYVAL_H
 
 struct keyval {
 	char *key;

diff --git a/lib.h b/lib.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIB_H
-#define LIB_H
+#ifndef CMUS_LIB_H
+#define CMUS_LIB_H
 
 #include "editable.h"
 #include "search.h"

diff --git a/list.h b/list.h
@@ -15,8 +15,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
+#ifndef CMUS_LIST_H
+#define CMUS_LIST_H
 
 #include "compiler.h" /* container_of */
 

diff --git a/load_dir.h b/load_dir.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LOAD_DIR_H
-#define _LOAD_DIR_H
+#ifndef CMUS_LOAD_DIR_H
+#define CMUS_LOAD_DIR_H
 
 #include <sys/stat.h>
 #include <stdlib.h>

diff --git a/locking.h b/locking.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LOCKING_H
-#define _LOCKING_H
+#ifndef CMUS_LOCKING_H
+#define CMUS_LOCKING_H
 
 #include <pthread.h>
 

diff --git a/mergesort.h b/mergesort.h
@@ -16,8 +16,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MERGESORT_H
-#define _MERGESORT_H
+#ifndef CMUS_MERGESORT_H
+#define CMUS_MERGESORT_H
 
 #include "list.h"