moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 15:28:50 -05:00
Code Issues Releases Wiki Activity

Do not #define _RESERVED_IDENTIFIERS

Browse Source 
Signed-off-by: Ivy Foster <ivy.foster@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Ivy Foster 2016-09-03 22:14:49 -05:00 committed by Allan McRae
parent ae56a32273
commit 0d2ba870c9
36 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libalpm/add.h
View File

@ -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: */

6
lib/libalpm/alpm.h
View File

@ -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: */

6
lib/libalpm/alpm_list.h
View File

@ -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: */

6
lib/libalpm/backup.h
View File

@ -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: */

4
lib/libalpm/base64.h
View File

@ -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>

6
lib/libalpm/conflict.h
View File

@ -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: */

6
lib/libalpm/db.h
View File

@ -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: */

6
lib/libalpm/delta.h
View File

@ -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: */

6
lib/libalpm/deps.h
View File

@ -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: */

6
lib/libalpm/diskspace.h
View File

@ -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: */

6
lib/libalpm/dload.h
View File

@ -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: */

6
lib/libalpm/filelist.h
View File

@ -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: */

6
lib/libalpm/graph.h
View File

@ -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: */

6
lib/libalpm/group.h
View File

@ -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: */

6
lib/libalpm/handle.h
View File

@ -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: */

6
lib/libalpm/hook.h
View File

@ -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: */

6
lib/libalpm/libarchive-compat.h
View File

@ -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: */

6
lib/libalpm/log.h
View File

@ -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: */

4
lib/libalpm/md5.h
View File

@ -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>

6
lib/libalpm/package.h
View File

@ -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: */

6
lib/libalpm/pkghash.h
View File

@ -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 */

6
lib/libalpm/remove.h
View File

@ -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: */

4
lib/libalpm/sha2.h
View File

@ -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>

6
lib/libalpm/signing.h
View File

@ -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: */

6
lib/libalpm/sync.h
View File

@ -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: */

6
lib/libalpm/trans.h
View File

@ -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: */

6
lib/libalpm/util.h
View File

@ -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: */

6
src/common/ini.h
View File

@ -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: */

6
src/common/util-common.h
View File

@ -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: */

6
src/pacman/callback.h
View File

@ -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: */

6
src/pacman/check.h
View File

@ -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: */

6
src/pacman/conf.h
View File

@ -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: */

6
src/pacman/package.h
View File

@ -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: */

6
src/pacman/pacman.h
View File

@ -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: */

6
src/pacman/sighandler.h
View File

@ -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: */

6
src/pacman/util.h
View File

@ -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: */