summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sommerseth <dazo@users.sourceforge.net>2013-05-28 14:52:06 +0200
committerDavid Sommerseth <dazo@users.sourceforge.net>2013-05-28 15:51:12 +0200
commitf9d6ec2ee6c547b9212be9320fb3bc4c13230e6f (patch)
treeb4fc25174984b322983dec66a1bddfc925146c10
parentb10c8f28497e390ede68334af66c0e9f7f35d335 (diff)
downloadeurephia-f9d6ec2ee6c547b9212be9320fb3bc4c13230e6f.tar.gz
eurephia-f9d6ec2ee6c547b9212be9320fb3bc4c13230e6f.tar.xz
eurephia-f9d6ec2ee6c547b9212be9320fb3bc4c13230e6f.zip
Use proper return type in eDBmappingFieldsPresent()
The field mapping id changed to unsigned long long in commit 60800a7030c7aa3a9e1a1b6155abc4079a0e34f1. This function needs to support that as well. Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
-rw-r--r--database/eurephiadb_mapping.c4
-rw-r--r--database/eurephiadb_mapping.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/database/eurephiadb_mapping.c b/database/eurephiadb_mapping.c
index e875a9e..879c795 100644
--- a/database/eurephiadb_mapping.c
+++ b/database/eurephiadb_mapping.c
@@ -412,8 +412,8 @@ const char *eDBmkSortKeyString(eDBfieldMap *tfmap, const char *skeys_str) {
* @return Returns a bit-wise OR'ed value of all fields in an eDBfieldMap which have their values
* set to something else than NULL.
*/
-long int eDBmappingFieldsPresent(eDBfieldMap *map) {
- long int ret = 0;
+unsigned long long eDBmappingFieldsPresent(eDBfieldMap *map) {
+ long long int ret = 0;
eDBfieldMap *p = NULL;
// Loops through all elements and flags those
diff --git a/database/eurephiadb_mapping.h b/database/eurephiadb_mapping.h
index fa9219e..556a6d0 100644
--- a/database/eurephiadb_mapping.h
+++ b/database/eurephiadb_mapping.h
@@ -281,7 +281,7 @@ static eDBfieldMap eTblMap_plugins[] = {
void eDBfreeMapping(eDBfieldMap *p);
eDBfieldMap *eDBxmlMapping(eurephiaCTX *ctx, eDBfieldMap *dbmap, const char *tblalias, xmlNode *fmap_n);
const char *eDBmkSortKeyString(eDBfieldMap *tfmap, const char *skeys_str);
-long int eDBmappingFieldsPresent(eDBfieldMap *map);
+unsigned long long eDBmappingFieldsPresent(eDBfieldMap *map);
const char *eDBmappingGetValue(eDBfieldMap *map, long long field_id);
int eDBmappingSetValue(eDBfieldMap *map, long long field_id, char *value);