summaryrefslogtreecommitdiff
path: root/include/urweb
diff options
context:
space:
mode:
authorGravatar Ziv Scully <ziv@mit.edu>2015-07-19 19:03:11 -0700
committerGravatar Ziv Scully <ziv@mit.edu>2015-07-19 19:03:11 -0700
commitbc38beafd07b7ae6106a2fffda82084a08af7f06 (patch)
tree788e74a4e66ebe79ce8e03c2787c09e0ee529b0f /include/urweb
parent03b7950e3639899de788cac8824a0e7f4be8a0bd (diff)
Rename C functions and remove functors nested inside modules.
Diffstat (limited to 'include/urweb')
-rw-r--r--include/urweb/types_cpp.h28
-rw-r--r--include/urweb/urweb_cpp.h6
2 files changed, 17 insertions, 17 deletions
diff --git a/include/urweb/types_cpp.h b/include/urweb/types_cpp.h
index 2f154e1f..7b9a90a4 100644
--- a/include/urweb/types_cpp.h
+++ b/include/urweb/types_cpp.h
@@ -123,31 +123,31 @@ typedef struct {
#include "uthash.h"
-typedef struct CacheValue {
+typedef struct uw_sqlcache_CacheValue {
char *result;
char *output;
-} CacheValue;
+} uw_sqlcache_CacheValue;
-typedef struct CacheEntry {
+typedef struct uw_sqlcache_CacheEntry {
char *key;
void *value;
time_t timeValid;
- struct CacheEntry *prev;
- struct CacheEntry *next;
+ struct uw_sqlcache_CacheEntry *prev;
+ struct uw_sqlcache_CacheEntry *next;
UT_hash_handle hh;
-} CacheEntry;
+} uw_sqlcache_CacheEntry;
-typedef struct CacheList {
- CacheEntry *first;
- CacheEntry *last;
+typedef struct uw_sqlcache_CacheList {
+ uw_sqlcache_CacheEntry *first;
+ uw_sqlcache_CacheEntry *last;
int size;
-} CacheList;
+} uw_sqlcache_CacheList;
-typedef struct Cache {
- CacheEntry *table;
+typedef struct uw_sqlcache_Cache {
+ uw_sqlcache_CacheEntry *table;
time_t timeInvalid;
- CacheList *lru;
+ uw_sqlcache_CacheList *lru;
int height;
-} Cache;
+} uw_sqlcache_Cache;
#endif
diff --git a/include/urweb/urweb_cpp.h b/include/urweb/urweb_cpp.h
index 3ae5b69e..3fac7041 100644
--- a/include/urweb/urweb_cpp.h
+++ b/include/urweb/urweb_cpp.h
@@ -406,8 +406,8 @@ void uw_Basis_writec(struct uw_context *, char);
#include "uthash.h"
-CacheValue *check(Cache *, char **);
-CacheValue *store(Cache *, char **, CacheValue *);
-CacheValue *flush(Cache *, char **);
+uw_sqlcache_CacheValue *uw_sqlcache_check(uw_sqlcache_Cache *, char **);
+uw_sqlcache_CacheValue *uw_sqlcache_store(uw_sqlcache_Cache *, char **, uw_sqlcache_CacheValue *);
+uw_sqlcache_CacheValue *uw_sqlcache_flush(uw_sqlcache_Cache *, char **);
#endif