diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2008-12-06 01:31:05 +0100 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2008-12-06 01:31:05 +0100 |
| commit | 6c8d48c8bee1983c6a8fe6a2bfeba3488e28c334 (patch) | |
| tree | 856e03b5a469bc1701a3276b6746ae4d40c424ae /common | |
| parent | ffad61f92c98072b26fc0e40f7de0642f74f3fe3 (diff) | |
| download | eurephia-6c8d48c8bee1983c6a8fe6a2bfeba3488e28c334.tar.gz eurephia-6c8d48c8bee1983c6a8fe6a2bfeba3488e28c334.tar.xz eurephia-6c8d48c8bee1983c6a8fe6a2bfeba3488e28c334.zip | |
Moved the typedef struct eFieldMap from *common.h to *struct.h
Diffstat (limited to 'common')
| -rw-r--r-- | common/eurephia_admin_common.h | 18 | ||||
| -rw-r--r-- | common/eurephia_admin_struct.h | 7 |
2 files changed, 17 insertions, 8 deletions
diff --git a/common/eurephia_admin_common.h b/common/eurephia_admin_common.h index 7593e2e..15fb3fd 100644 --- a/common/eurephia_admin_common.h +++ b/common/eurephia_admin_common.h @@ -21,6 +21,8 @@ #ifndef EUREPHIA_ADMIN_COMMON_H_ # define EUREPHIA_ADMIN_COMMON_H_ +#include <eurephia_admin_struct.h> + #define TABLE_USERS 0x01 #define TABLE_CERTS 0x02 #define TABLE_LASTLOG 0x03 @@ -51,14 +53,7 @@ #define SORTKEY_LOGIN 0x20000 #define SORTKEY_LOGOUT 0x40000 - -typedef struct { - int tableid; - long sortkeyid; - char *fieldname; -} eFieldMap; - - +#ifdef EUREPHIA_ADMIN_COMMON_C eFieldMap eSortkeys_user[] = { {TABLE_USERS, SORTKEY_RECID, "recid"}, {TABLE_USERS, SORTKEY_RECID, "uid"}, @@ -112,9 +107,16 @@ eFieldMap eSortkeys_blacklist[] = { {TABLE_BLACKLIST, SORTKEY_NONE, NULL} }; +#endif // #ifdef EUREPHIA_ADMIN_COMMON_C + eFieldMap *eAdminGetTableMap(int table); char *eAdminGetSortKey(int table, const char *str); +eurephiaUSERINFO *eAdminPopulateUSERINFO(int uid, const char *uname, const char *pwd, + const char *activated, const char *deactivd, const char *lastacc); + +void _eAdminFreeUSERINFO_func(eurephiaUSERINFO *); +#define eAdminFreeUSERINFO(x) { _eAdminFreeUSERINFO_func(x); x = NULL; } #endif /* !EUREPHIA_ADMIN_COMMON_H_ */ diff --git a/common/eurephia_admin_struct.h b/common/eurephia_admin_struct.h index 5a13a1f..9f962bf 100644 --- a/common/eurephia_admin_struct.h +++ b/common/eurephia_admin_struct.h @@ -71,4 +71,11 @@ typedef struct { int maxlen_header; } eurephiaLOGLIST; + +typedef struct { + int tableid; + long sortkeyid; + char *fieldname; +} eFieldMap; + #endif |