libalpm: rename __foo tyes to _foo
__foo is reserved in c and should not be used. Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
2109de613a
commit
c5c6633dd1
8 changed files with 16 additions and 16 deletions
|
@ -78,7 +78,7 @@ extern "C" {
|
||||||
* This struct represents an instance of libalpm.
|
* This struct represents an instance of libalpm.
|
||||||
* @ingroup libalpm_handle
|
* @ingroup libalpm_handle
|
||||||
*/
|
*/
|
||||||
typedef struct __alpm_handle_t alpm_handle_t;
|
typedef struct _alpm_handle_t alpm_handle_t;
|
||||||
|
|
||||||
/** A database.
|
/** A database.
|
||||||
*
|
*
|
||||||
|
@ -98,7 +98,7 @@ typedef struct __alpm_handle_t alpm_handle_t;
|
||||||
* Databases are automatically unregistered when the \link alpm_handle_t \endlink is released.
|
* Databases are automatically unregistered when the \link alpm_handle_t \endlink is released.
|
||||||
* @ingroup libalpm_databases
|
* @ingroup libalpm_databases
|
||||||
*/
|
*/
|
||||||
typedef struct __alpm_db_t alpm_db_t;
|
typedef struct _alpm_db_t alpm_db_t;
|
||||||
|
|
||||||
|
|
||||||
/** A package.
|
/** A package.
|
||||||
|
@ -111,7 +111,7 @@ typedef struct __alpm_db_t alpm_db_t;
|
||||||
* to be added or removed from the system.
|
* to be added or removed from the system.
|
||||||
* @ingroup libalpm_packages
|
* @ingroup libalpm_packages
|
||||||
*/
|
*/
|
||||||
typedef struct __alpm_pkg_t alpm_pkg_t;
|
typedef struct _alpm_pkg_t alpm_pkg_t;
|
||||||
|
|
||||||
/** The time type used by libalpm. Represents a unix time stamp
|
/** The time type used by libalpm. Represents a unix time stamp
|
||||||
* @ingroup libalpm_misc */
|
* @ingroup libalpm_misc */
|
||||||
|
|
|
@ -48,13 +48,13 @@ extern "C" {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/** A doubly linked list */
|
/** A doubly linked list */
|
||||||
typedef struct __alpm_list_t {
|
typedef struct _alpm_list_t {
|
||||||
/** data held by the list node */
|
/** data held by the list node */
|
||||||
void *data;
|
void *data;
|
||||||
/** pointer to the previous node */
|
/** pointer to the previous node */
|
||||||
struct __alpm_list_t *prev;
|
struct _alpm_list_t *prev;
|
||||||
/** pointer to the next node */
|
/** pointer to the next node */
|
||||||
struct __alpm_list_t *next;
|
struct _alpm_list_t *next;
|
||||||
} alpm_list_t;
|
} alpm_list_t;
|
||||||
|
|
||||||
/** Frees a list and its contents */
|
/** Frees a list and its contents */
|
||||||
|
|
|
@ -62,7 +62,7 @@ struct db_operations {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Database */
|
/* Database */
|
||||||
struct __alpm_db_t {
|
struct _alpm_db_t {
|
||||||
alpm_handle_t *handle;
|
alpm_handle_t *handle;
|
||||||
char *treename;
|
char *treename;
|
||||||
/* do not access directly, use _alpm_db_path(db) for lazy access */
|
/* do not access directly, use _alpm_db_path(db) for lazy access */
|
||||||
|
|
|
@ -43,7 +43,7 @@ enum mount_fsinfo {
|
||||||
MOUNT_FSINFO_FAIL,
|
MOUNT_FSINFO_FAIL,
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct __alpm_mountpoint_t {
|
typedef struct _alpm_mountpoint_t {
|
||||||
/* mount point information */
|
/* mount point information */
|
||||||
char *mount_dir;
|
char *mount_dir;
|
||||||
size_t mount_dir_len;
|
size_t mount_dir_len;
|
||||||
|
|
|
@ -23,19 +23,19 @@
|
||||||
|
|
||||||
#include "alpm_list.h"
|
#include "alpm_list.h"
|
||||||
|
|
||||||
enum __alpm_graph_vertex_state {
|
enum _alpm_graph_vertex_state {
|
||||||
ALPM_GRAPH_STATE_UNPROCESSED,
|
ALPM_GRAPH_STATE_UNPROCESSED,
|
||||||
ALPM_GRAPH_STATE_PROCESSING,
|
ALPM_GRAPH_STATE_PROCESSING,
|
||||||
ALPM_GRAPH_STATE_PROCESSED
|
ALPM_GRAPH_STATE_PROCESSED
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct __alpm_graph_t {
|
typedef struct _alpm_graph_t {
|
||||||
void *data;
|
void *data;
|
||||||
struct __alpm_graph_t *parent; /* where did we come from? */
|
struct _alpm_graph_t *parent; /* where did we come from? */
|
||||||
alpm_list_t *children;
|
alpm_list_t *children;
|
||||||
alpm_list_t *iterator; /* used for DFS without recursion */
|
alpm_list_t *iterator; /* used for DFS without recursion */
|
||||||
off_t weight; /* weight of the node */
|
off_t weight; /* weight of the node */
|
||||||
enum __alpm_graph_vertex_state state;
|
enum _alpm_graph_vertex_state state;
|
||||||
} alpm_graph_t;
|
} alpm_graph_t;
|
||||||
|
|
||||||
alpm_graph_t *_alpm_graph_new(void);
|
alpm_graph_t *_alpm_graph_new(void);
|
||||||
|
|
|
@ -51,7 +51,7 @@ do { \
|
||||||
} \
|
} \
|
||||||
} while(0)
|
} while(0)
|
||||||
|
|
||||||
struct __alpm_handle_t {
|
struct _alpm_handle_t {
|
||||||
/* internal usage */
|
/* internal usage */
|
||||||
alpm_db_t *db_local; /* local db pointer */
|
alpm_db_t *db_local; /* local db pointer */
|
||||||
alpm_list_t *dbs_sync; /* List of (alpm_db_t *) */
|
alpm_list_t *dbs_sync; /* List of (alpm_db_t *) */
|
||||||
|
|
|
@ -85,7 +85,7 @@ struct pkg_operations {
|
||||||
*/
|
*/
|
||||||
extern const struct pkg_operations default_pkg_ops;
|
extern const struct pkg_operations default_pkg_ops;
|
||||||
|
|
||||||
struct __alpm_pkg_t {
|
struct _alpm_pkg_t {
|
||||||
unsigned long name_hash;
|
unsigned long name_hash;
|
||||||
char *filename;
|
char *filename;
|
||||||
char *base;
|
char *base;
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
* A combination of a hash table and a list, allowing for fast look-up
|
* A combination of a hash table and a list, allowing for fast look-up
|
||||||
* by package name but also iteration over the packages.
|
* by package name but also iteration over the packages.
|
||||||
*/
|
*/
|
||||||
struct __alpm_pkghash_t {
|
struct _alpm_pkghash_t {
|
||||||
/** data held by the hash table */
|
/** data held by the hash table */
|
||||||
alpm_list_t **hash_table;
|
alpm_list_t **hash_table;
|
||||||
/** head node of the hash table data in normal list format */
|
/** head node of the hash table data in normal list format */
|
||||||
|
@ -45,7 +45,7 @@ struct __alpm_pkghash_t {
|
||||||
unsigned int limit;
|
unsigned int limit;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct __alpm_pkghash_t alpm_pkghash_t;
|
typedef struct _alpm_pkghash_t alpm_pkghash_t;
|
||||||
|
|
||||||
alpm_pkghash_t *_alpm_pkghash_create(unsigned int size);
|
alpm_pkghash_t *_alpm_pkghash_create(unsigned int size);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue