[pacman-dev] [PATCH v2 1/2] Do not #define _RESERVED_IDENTIFIERS
ivy.foster at gmail.com
ivy.foster at gmail.com
Sun Sep 4 03:14:49 UTC 2016
From: Ivy Foster <ivy.foster at gmail.com>
Signed-off-by: Ivy Foster <ivy.foster at gmail.com>
---
lib/libalpm/add.h | 6 +++---
lib/libalpm/alpm.h | 6 +++---
lib/libalpm/alpm_list.h | 6 +++---
lib/libalpm/backup.h | 6 +++---
lib/libalpm/base64.h | 4 ++--
lib/libalpm/conflict.h | 6 +++---
lib/libalpm/db.h | 6 +++---
lib/libalpm/delta.h | 6 +++---
lib/libalpm/deps.h | 6 +++---
lib/libalpm/diskspace.h | 6 +++---
lib/libalpm/dload.h | 6 +++---
lib/libalpm/filelist.h | 6 +++---
lib/libalpm/graph.h | 6 +++---
lib/libalpm/group.h | 6 +++---
lib/libalpm/handle.h | 6 +++---
lib/libalpm/hook.h | 6 +++---
lib/libalpm/libarchive-compat.h | 6 +++---
lib/libalpm/log.h | 6 +++---
lib/libalpm/md5.h | 4 ++--
lib/libalpm/package.h | 6 +++---
lib/libalpm/pkghash.h | 6 +++---
lib/libalpm/remove.h | 6 +++---
lib/libalpm/sha2.h | 4 ++--
lib/libalpm/signing.h | 6 +++---
lib/libalpm/sync.h | 6 +++---
lib/libalpm/trans.h | 6 +++---
lib/libalpm/util.h | 6 +++---
src/common/ini.h | 6 +++---
src/common/util-common.h | 6 +++---
src/pacman/callback.h | 6 +++---
src/pacman/check.h | 6 +++---
src/pacman/conf.h | 6 +++---
src/pacman/package.h | 6 +++---
src/pacman/pacman.h | 6 +++---
src/pacman/sighandler.h | 6 +++---
src/pacman/util.h | 6 +++---
36 files changed, 105 insertions(+), 105 deletions(-)
diff --git a/lib/libalpm/add.h b/lib/libalpm/add.h
index aa707fa..c1ab62a 100644
--- a/lib/libalpm/add.h
+++ b/lib/libalpm/add.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_ADD_H
-#define _ALPM_ADD_H
+#ifndef ALPM_ADD_H
+#define ALPM_ADD_H
#include "db.h"
#include "alpm_list.h"
@@ -26,6 +26,6 @@
int _alpm_upgrade_packages(alpm_handle_t *handle);
-#endif /* _ALPM_ADD_H */
+#endif /* ALPM_ADD_H */
/* vim: set noet: */
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 168d71b..7955585 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -20,8 +20,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_H
-#define _ALPM_H
+#ifndef ALPM_H
+#define ALPM_H
#ifdef __cplusplus
extern "C" {
@@ -1624,6 +1624,6 @@ void alpm_conflict_free(alpm_conflict_t *conflict);
#ifdef __cplusplus
}
#endif
-#endif /* _ALPM_H */
+#endif /* ALPM_H */
/* vim: set noet: */
diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h
index 5af84e1..cf7d463 100644
--- a/lib/libalpm/alpm_list.h
+++ b/lib/libalpm/alpm_list.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_LIST_H
-#define _ALPM_LIST_H
+#ifndef ALPM_LIST_H
+#define ALPM_LIST_H
#include <stdlib.h> /* size_t */
@@ -90,6 +90,6 @@ void *alpm_list_to_array(const alpm_list_t *list, size_t n, size_t size);
#ifdef __cplusplus
}
#endif
-#endif /* _ALPM_LIST_H */
+#endif /* ALPM_LIST_H */
/* vim: set noet: */
diff --git a/lib/libalpm/backup.h b/lib/libalpm/backup.h
index 2e11dbc..5cf3f90 100644
--- a/lib/libalpm/backup.h
+++ b/lib/libalpm/backup.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_BACKUP_H
-#define _ALPM_BACKUP_H
+#ifndef ALPM_BACKUP_H
+#define ALPM_BACKUP_H
#include "alpm_list.h"
#include "alpm.h"
@@ -28,6 +28,6 @@ alpm_backup_t *_alpm_needbackup(const char *file, alpm_pkg_t *pkg);
void _alpm_backup_free(alpm_backup_t *backup);
alpm_backup_t *_alpm_backup_dup(const alpm_backup_t *backup);
-#endif /* _ALPM_BACKUP_H */
+#endif /* ALPM_BACKUP_H */
/* vim: set noet: */
diff --git a/lib/libalpm/base64.h b/lib/libalpm/base64.h
index df684ab..9edb864 100644
--- a/lib/libalpm/base64.h
+++ b/lib/libalpm/base64.h
@@ -22,8 +22,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _BASE64_H
-#define _BASE64_H
+#ifndef BASE64_H
+#define BASE64_H
#include <string.h>
diff --git a/lib/libalpm/conflict.h b/lib/libalpm/conflict.h
index e17d552..801c201 100644
--- a/lib/libalpm/conflict.h
+++ b/lib/libalpm/conflict.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_CONFLICT_H
-#define _ALPM_CONFLICT_H
+#ifndef ALPM_CONFLICT_H
+#define ALPM_CONFLICT_H
#include "alpm.h"
#include "db.h"
@@ -30,6 +30,6 @@ alpm_list_t *_alpm_outerconflicts(alpm_db_t *db, alpm_list_t *packages);
alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
alpm_list_t *upgrade, alpm_list_t *remove);
-#endif /* _ALPM_CONFLICT_H */
+#endif /* ALPM_CONFLICT_H */
/* vim: set noet: */
diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h
index 05ef43e..e696298 100644
--- a/lib/libalpm/db.h
+++ b/lib/libalpm/db.h
@@ -19,8 +19,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_DB_H
-#define _ALPM_DB_H
+#ifndef ALPM_DB_H
+#define ALPM_DB_H
/* libarchive */
#include <archive.h>
@@ -107,6 +107,6 @@ alpm_pkg_t *_alpm_db_get_pkgfromcache(alpm_db_t *db, const char *target);
alpm_list_t *_alpm_db_get_groupcache(alpm_db_t *db);
alpm_group_t *_alpm_db_get_groupfromcache(alpm_db_t *db, const char *target);
-#endif /* _ALPM_DB_H */
+#endif /* ALPM_DB_H */
/* vim: set noet: */
diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h
index c7bbade..26c3c4c 100644
--- a/lib/libalpm/delta.h
+++ b/lib/libalpm/delta.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_DELTA_H
-#define _ALPM_DELTA_H
+#ifndef ALPM_DELTA_H
+#define ALPM_DELTA_H
#include <sys/types.h> /* off_t */
@@ -30,6 +30,6 @@ alpm_delta_t *_alpm_delta_dup(const alpm_delta_t *delta);
off_t _alpm_shortest_delta_path(alpm_handle_t *handle, alpm_list_t *deltas,
const char *to, alpm_list_t **path);
-#endif /* _ALPM_DELTA_H */
+#endif /* ALPM_DELTA_H */
/* vim: set noet: */
diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h
index 691f505..91c6eb6 100644
--- a/lib/libalpm/deps.h
+++ b/lib/libalpm/deps.h
@@ -19,8 +19,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_DEPS_H
-#define _ALPM_DEPS_H
+#ifndef ALPM_DEPS_H
+#define ALPM_DEPS_H
#include "db.h"
#include "sync.h"
@@ -38,6 +38,6 @@ int _alpm_depcmp_literal(alpm_pkg_t *pkg, alpm_depend_t *dep);
int _alpm_depcmp_provides(alpm_depend_t *dep, alpm_list_t *provisions);
int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep);
-#endif /* _ALPM_DEPS_H */
+#endif /* ALPM_DEPS_H */
/* vim: set noet: */
diff --git a/lib/libalpm/diskspace.h b/lib/libalpm/diskspace.h
index acda05a..8c0e4e6 100644
--- a/lib/libalpm/diskspace.h
+++ b/lib/libalpm/diskspace.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_DISKSPACE_H
-#define _ALPM_DISKSPACE_H
+#ifndef ALPM_DISKSPACE_H
+#define ALPM_DISKSPACE_H
#if defined(HAVE_SYS_MOUNT_H)
#include <sys/mount.h>
@@ -60,6 +60,6 @@ int _alpm_check_diskspace(alpm_handle_t *handle);
int _alpm_check_downloadspace(alpm_handle_t *handle, const char *cachedir,
size_t num_files, off_t *file_sizes);
-#endif /* _ALPM_DISKSPACE_H */
+#endif /* ALPM_DISKSPACE_H */
/* vim: set noet: */
diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h
index 60843bd..427c486 100644
--- a/lib/libalpm/dload.h
+++ b/lib/libalpm/dload.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_DLOAD_H
-#define _ALPM_DLOAD_H
+#ifndef ALPM_DLOAD_H
+#define ALPM_DLOAD_H
#include "alpm_list.h"
#include "alpm.h"
@@ -51,6 +51,6 @@ void _alpm_dload_payload_reset(struct dload_payload *payload);
int _alpm_download(struct dload_payload *payload, const char *localpath,
char **final_file, const char **final_url);
-#endif /* _ALPM_DLOAD_H */
+#endif /* ALPM_DLOAD_H */
/* vim: set noet: */
diff --git a/lib/libalpm/filelist.h b/lib/libalpm/filelist.h
index 5560ea0..a74bdea 100644
--- a/lib/libalpm/filelist.h
+++ b/lib/libalpm/filelist.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_FILELIST_H
-#define _ALPM_FILELIST_H
+#ifndef ALPM_FILELIST_H
+#define ALPM_FILELIST_H
#include "alpm.h"
@@ -29,6 +29,6 @@ alpm_list_t *_alpm_filelist_intersection(alpm_filelist_t *filesA,
int _alpm_files_cmp(const void *f1, const void *f2);
-#endif /* _ALPM_FILELIST_H */
+#endif /* ALPM_FILELIST_H */
/* vim: set noet: */
diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h
index 76a268a..22f0aa9 100644
--- a/lib/libalpm/graph.h
+++ b/lib/libalpm/graph.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_GRAPH_H
-#define _ALPM_GRAPH_H
+#ifndef ALPM_GRAPH_H
+#define ALPM_GRAPH_H
#include <sys/types.h> /* off_t */
@@ -35,6 +35,6 @@ typedef struct __alpm_graph_t {
alpm_graph_t *_alpm_graph_new(void);
void _alpm_graph_free(void *data);
-#endif /* _ALPM_GRAPH_H */
+#endif /* ALPM_GRAPH_H */
/* vim: set noet: */
diff --git a/lib/libalpm/group.h b/lib/libalpm/group.h
index 1db4e36..aa33076 100644
--- a/lib/libalpm/group.h
+++ b/lib/libalpm/group.h
@@ -17,14 +17,14 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_GROUP_H
-#define _ALPM_GROUP_H
+#ifndef ALPM_GROUP_H
+#define ALPM_GROUP_H
#include "alpm.h"
alpm_group_t *_alpm_group_new(const char *name);
void _alpm_group_free(alpm_group_t *grp);
-#endif /* _ALPM_GROUP_H */
+#endif /* ALPM_GROUP_H */
/* vim: set noet: */
diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h
index a1d0f9a..ecbe837 100644
--- a/lib/libalpm/handle.h
+++ b/lib/libalpm/handle.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_HANDLE_H
-#define _ALPM_HANDLE_H
+#ifndef ALPM_HANDLE_H
+#define ALPM_HANDLE_H
#include <stdio.h>
#include <sys/types.h>
@@ -123,6 +123,6 @@ int _alpm_handle_unlock(alpm_handle_t *handle);
alpm_errno_t _alpm_set_directory_option(const char *value,
char **storage, int must_exist);
-#endif /* _ALPM_HANDLE_H */
+#endif /* ALPM_HANDLE_H */
/* vim: set noet: */
diff --git a/lib/libalpm/hook.h b/lib/libalpm/hook.h
index 01eb3ed..f33dfe1 100644
--- a/lib/libalpm/hook.h
+++ b/lib/libalpm/hook.h
@@ -17,13 +17,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_HOOK_H
-#define _ALPM_HOOK_H
+#ifndef ALPM_HOOK_H
+#define ALPM_HOOK_H
#include "alpm.h"
int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when);
-#endif /* _ALPM_HOOK_H */
+#endif /* ALPM_HOOK_H */
/* vim: set noet: */
diff --git a/lib/libalpm/libarchive-compat.h b/lib/libalpm/libarchive-compat.h
index 3b46a5a..d4aa4fa 100644
--- a/lib/libalpm/libarchive-compat.h
+++ b/lib/libalpm/libarchive-compat.h
@@ -1,5 +1,5 @@
-#ifndef _LIBARCHIVE_COMPAT_H
-#define _LIBARCHIVE_COMPAT_H
+#ifndef LIBARCHIVE_COMPAT_H
+#define LIBARCHIVE_COMPAT_H
/*
* libarchive-compat.h
@@ -68,6 +68,6 @@ static inline int _alpm_archive_read_support_filter_all(struct archive *archive)
#endif
}
-#endif /* _LIBARCHIVE_COMPAT_H */
+#endif /* LIBARCHIVE_COMPAT_H */
/* vim: set noet: */
diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h
index 3fd6196..79074fc 100644
--- a/lib/libalpm/log.h
+++ b/lib/libalpm/log.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_LOG_H
-#define _ALPM_LOG_H
+#ifndef ALPM_LOG_H
+#define ALPM_LOG_H
#include "alpm.h"
@@ -27,6 +27,6 @@
void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag,
const char *fmt, ...) __attribute__((format(printf,3,4)));
-#endif /* _ALPM_LOG_H */
+#endif /* ALPM_LOG_H */
/* vim: set noet: */
diff --git a/lib/libalpm/md5.h b/lib/libalpm/md5.h
index d03013a..4a6fe4d 100644
--- a/lib/libalpm/md5.h
+++ b/lib/libalpm/md5.h
@@ -21,8 +21,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _MD5_H
-#define _MD5_H
+#ifndef MD5_H
+#define MD5_H
#include <string.h>
diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h
index 31add9a..114d225 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -21,8 +21,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_PACKAGE_H
-#define _ALPM_PACKAGE_H
+#ifndef ALPM_PACKAGE_H
+#define ALPM_PACKAGE_H
#include <sys/types.h> /* off_t */
@@ -153,6 +153,6 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle,
int _alpm_pkg_cmp(const void *p1, const void *p2);
int _alpm_pkg_compare_versions(alpm_pkg_t *local_pkg, alpm_pkg_t *pkg);
-#endif /* _ALPM_PACKAGE_H */
+#endif /* ALPM_PACKAGE_H */
/* vim: set noet: */
diff --git a/lib/libalpm/pkghash.h b/lib/libalpm/pkghash.h
index c843a43..be064f6 100644
--- a/lib/libalpm/pkghash.h
+++ b/lib/libalpm/pkghash.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_PKGHASH_H
-#define _ALPM_PKGHASH_H
+#ifndef ALPM_PKGHASH_H
+#define ALPM_PKGHASH_H
#include <stdlib.h>
@@ -57,4 +57,4 @@ void _alpm_pkghash_free(alpm_pkghash_t *hash);
alpm_pkg_t *_alpm_pkghash_find(alpm_pkghash_t *hash, const char *name);
-#endif /* _ALPM_PKGHASH_H */
+#endif /* ALPM_PKGHASH_H */
diff --git a/lib/libalpm/remove.h b/lib/libalpm/remove.h
index e6e1b22..b26ea60 100644
--- a/lib/libalpm/remove.h
+++ b/lib/libalpm/remove.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_REMOVE_H
-#define _ALPM_REMOVE_H
+#ifndef ALPM_REMOVE_H
+#define ALPM_REMOVE_H
#include "db.h"
#include "alpm_list.h"
@@ -31,6 +31,6 @@ int _alpm_remove_single_package(alpm_handle_t *handle,
alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg,
size_t targ_count, size_t pkg_count);
-#endif /* _ALPM_REMOVE_H */
+#endif /* ALPM_REMOVE_H */
/* vim: set noet: */
diff --git a/lib/libalpm/sha2.h b/lib/libalpm/sha2.h
index 887b9c6..99267de 100644
--- a/lib/libalpm/sha2.h
+++ b/lib/libalpm/sha2.h
@@ -21,8 +21,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _SHA2_H
-#define _SHA2_H
+#ifndef SHA2_H
+#define SHA2_H
#include <string.h>
diff --git a/lib/libalpm/signing.h b/lib/libalpm/signing.h
index 9e12cfa..960b644 100644
--- a/lib/libalpm/signing.h
+++ b/lib/libalpm/signing.h
@@ -16,8 +16,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_SIGNING_H
-#define _ALPM_SIGNING_H
+#ifndef ALPM_SIGNING_H
+#define ALPM_SIGNING_H
#include "alpm.h"
@@ -34,6 +34,6 @@ int _alpm_process_siglist(alpm_handle_t *handle, const char *identifier,
int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr);
int _alpm_key_import(alpm_handle_t *handle, const char *fpr);
-#endif /* _ALPM_SIGNING_H */
+#endif /* ALPM_SIGNING_H */
/* vim: set noet: */
diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h
index f6c610e..1aa48b7 100644
--- a/lib/libalpm/sync.h
+++ b/lib/libalpm/sync.h
@@ -19,8 +19,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_SYNC_H
-#define _ALPM_SYNC_H
+#ifndef ALPM_SYNC_H
+#define ALPM_SYNC_H
#include "alpm.h"
@@ -29,6 +29,6 @@ int _alpm_sync_load(alpm_handle_t *handle, alpm_list_t **data);
int _alpm_sync_check(alpm_handle_t *handle, alpm_list_t **data);
int _alpm_sync_commit(alpm_handle_t *handle);
-#endif /* _ALPM_SYNC_H */
+#endif /* ALPM_SYNC_H */
/* vim: set noet: */
diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h
index d2eb681..73111be 100644
--- a/lib/libalpm/trans.h
+++ b/lib/libalpm/trans.h
@@ -20,8 +20,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_TRANS_H
-#define _ALPM_TRANS_H
+#ifndef ALPM_TRANS_H
+#define ALPM_TRANS_H
#include "alpm.h"
@@ -50,6 +50,6 @@ int _alpm_trans_init(alpm_trans_t *trans, alpm_transflag_t flags);
int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath,
const char *script, const char *ver, const char *oldver, int is_archive);
-#endif /* _ALPM_TRANS_H */
+#endif /* ALPM_TRANS_H */
/* vim: set noet: */
diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h
index 9494986..5a2c105 100644
--- a/lib/libalpm/util.h
+++ b/lib/libalpm/util.h
@@ -21,8 +21,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _ALPM_UTIL_H
-#define _ALPM_UTIL_H
+#ifndef ALPM_UTIL_H
+#define ALPM_UTIL_H
#include "alpm_list.h"
#include "alpm.h"
@@ -156,6 +156,6 @@ char *strsep(char **, const char *);
#define UNUSED __attribute__((unused))
-#endif /* _ALPM_UTIL_H */
+#endif /* ALPM_UTIL_H */
/* vim: set noet: */
diff --git a/src/common/ini.h b/src/common/ini.h
index 2b4f79d..e03a83f 100644
--- a/src/common/ini.h
+++ b/src/common/ini.h
@@ -17,14 +17,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _PM_INI_H
-#define _PM_INI_H
+#ifndef PM_INI_H
+#define PM_INI_H
typedef int (ini_parser_fn)(const char *file, int line, const char *section,
char *key, char *value, void *data);
int parse_ini(const char *file, ini_parser_fn cb, void *data);
-#endif /* _PM_CONF_H */
+#endif /* PM_INI_H */
/* vim: set noet: */
diff --git a/src/common/util-common.h b/src/common/util-common.h
index 9df6a70..1452094 100644
--- a/src/common/util-common.h
+++ b/src/common/util-common.h
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _PM_UTIL_COMMON_H
-#define _PM_UTIL_COMMON_H
+#ifndef PM_UTIL_COMMON_H
+#define PM_UTIL_COMMON_H
#include <stdio.h>
#include <sys/stat.h> /* struct stat */
@@ -38,6 +38,6 @@ char *strndup(const char *s, size_t n);
#define ARRAYSIZE(a) (sizeof (a) / sizeof (a[0]))
-#endif /* _PM_UTIL_COMMON_H */
+#endif /* PM_UTIL_COMMON_H */
/* vim: set noet: */
diff --git a/src/pacman/callback.h b/src/pacman/callback.h
index fc83fb7..ad395e9 100644
--- a/src/pacman/callback.h
+++ b/src/pacman/callback.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _PM_CALLBACK_H
-#define _PM_CALLBACK_H
+#ifndef PM_CALLBACK_H
+#define PM_CALLBACK_H
#include <sys/types.h> /* off_t */
@@ -43,6 +43,6 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total);
__attribute__((format(printf, 2, 0)))
void cb_log(alpm_loglevel_t level, const char *fmt, va_list args);
-#endif /* _PM_CALLBACK_H */
+#endif /* PM_CALLBACK_H */
/* vim: set noet: */
diff --git a/src/pacman/check.h b/src/pacman/check.h
index 362a352..5052376 100644
--- a/src/pacman/check.h
+++ b/src/pacman/check.h
@@ -17,14 +17,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _PM_CHECK_H
-#define _PM_CHECK_H
+#ifndef PM_CHECK_H
+#define PM_CHECK_H
#include <alpm.h>
int check_pkg_fast(alpm_pkg_t *pkg);
int check_pkg_full(alpm_pkg_t *pkg);
-#endif /* _PM_CHECK_H */
+#endif /* PM_CHECK_H */
/* vim: set noet: */
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 2aba8bf..2ddeadb 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _PM_CONF_H
-#define _PM_CONF_H
+#ifndef PM_CONF_H
+#define PM_CONF_H
#include <alpm.h>
@@ -234,6 +234,6 @@ void config_repo_free(config_repo_t *repo);
int config_set_arch(const char *arch);
int parseconfig(const char *file);
-#endif /* _PM_CONF_H */
+#endif /* PM_CONF_H */
/* vim: set noet: */
diff --git a/src/pacman/package.h b/src/pacman/package.h
index e369330..3129a73 100644
--- a/src/pacman/package.h
+++ b/src/pacman/package.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _PM_PACKAGE_H
-#define _PM_PACKAGE_H
+#ifndef PM_PACKAGE_H
+#define PM_PACKAGE_H
#include <alpm.h>
@@ -31,6 +31,6 @@ void dump_pkg_changelog(alpm_pkg_t *pkg);
void print_installed(alpm_db_t *db_local, alpm_pkg_t *pkg);
int dump_pkg_search(alpm_db_t *db, alpm_list_t *targets, int show_status);
-#endif /* _PM_PACKAGE_H */
+#endif /* PM_PACKAGE_H */
/* vim: set noet: */
diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h
index edb81b1..84f70a6 100644
--- a/src/pacman/pacman.h
+++ b/src/pacman/pacman.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _PM_PACMAN_H
-#define _PM_PACMAN_H
+#ifndef PM_PACMAN_H
+#define PM_PACMAN_H
#include <alpm_list.h>
@@ -40,6 +40,6 @@ int sync_prepare_execute(void);
/* upgrade.c */
int pacman_upgrade(alpm_list_t *targets);
-#endif /* _PM_PACMAN_H */
+#endif /* PM_PACMAN_H */
/* vim: set noet: */
diff --git a/src/pacman/sighandler.h b/src/pacman/sighandler.h
index 3fddaee..108a7e0 100644
--- a/src/pacman/sighandler.h
+++ b/src/pacman/sighandler.h
@@ -17,14 +17,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _PM_SIGHANDLER_H
-#define _PM_SIGHANDLER_H
+#ifndef PM_SIGHANDLER_H
+#define PM_SIGHANDLER_H
void install_segv_handler(void);
void install_winch_handler(void);
void install_soft_interrupt_handler(void);
void remove_soft_interrupt_handler(void);
-#endif /* _PM_SIGHANDLER_H */
+#endif /* PM_SIGHANDLER_H */
/* vim: set noet: */
diff --git a/src/pacman/util.h b/src/pacman/util.h
index f5e37c8..74ce4cb 100644
--- a/src/pacman/util.h
+++ b/src/pacman/util.h
@@ -17,8 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _PM_UTIL_H
-#define _PM_UTIL_H
+#ifndef PM_UTIL_H
+#define PM_UTIL_H
#include <stdlib.h>
#include <stdarg.h>
@@ -82,6 +82,6 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list
int pm_sprintf(char **string, alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,3,4)));
int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0)));
-#endif /* _PM_UTIL_H */
+#endif /* PM_UTIL_H */
/* vim: set noet: */
--
2.9.3
More information about the pacman-dev
mailing list