From 712a28aaae6671be673f9b125cae59aec628d267 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 19 Dec 2007 15:45:22 +0100 Subject: Rename cache.[ch] to memcache.[ch] cache.h conflicts with an XFS DMAPI include on "opi" :-( (This used to be commit b8db804e07cc19d406ba3892d6eecbe16132a89a) --- source3/include/cache.h | 51 ---------------------------------------------- source3/include/includes.h | 2 +- source3/include/memcache.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 source3/include/cache.h create mode 100644 source3/include/memcache.h (limited to 'source3/include') diff --git a/source3/include/cache.h b/source3/include/cache.h deleted file mode 100644 index 460a33b3a1..0000000000 --- a/source3/include/cache.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - Unix SMB/CIFS implementation. - In-memory cache - Copyright (C) Volker Lendecke 2005-2007 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef __CACHE_H__ -#define __CACHE_H__ - -#include "includes.h" - -struct memcache; - -enum memcache_number { - STAT_CACHE, - UID_SID_CACHE, - SID_UID_CACHE, - GID_SID_CACHE, - SID_GID_CACHE, - GETWD_CACHE, - GETPWNAM_CACHE, - MANGLE_HASH2_CACHE -}; - -struct memcache *memcache_init(TALLOC_CTX *mem_ctx, size_t max_size); - -void memcache_add(struct memcache *cache, enum memcache_number n, - DATA_BLOB key, DATA_BLOB value); - -void memcache_delete(struct memcache *cache, enum memcache_number n, - DATA_BLOB key); - -bool memcache_lookup(struct memcache *cache, enum memcache_number n, - DATA_BLOB key, DATA_BLOB *value); - -void memcache_flush(struct memcache *cache, enum memcache_number n); - -#endif diff --git a/source3/include/includes.h b/source3/include/includes.h index a45176aba3..fdeff346e5 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -719,7 +719,7 @@ typedef char fstring[FSTRING_LEN]; #include "packet.h" #include "ctdbd_conn.h" #include "talloc_stack.h" -#include "cache.h" +#include "memcache.h" /* used in net.c */ struct functable { diff --git a/source3/include/memcache.h b/source3/include/memcache.h new file mode 100644 index 0000000000..f849f8ad3b --- /dev/null +++ b/source3/include/memcache.h @@ -0,0 +1,51 @@ +/* + Unix SMB/CIFS implementation. + In-memory cache + Copyright (C) Volker Lendecke 2005-2007 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef __MEMCACHE_H__ +#define __MEMCACHE_H__ + +#include "includes.h" + +struct memcache; + +enum memcache_number { + STAT_CACHE, + UID_SID_CACHE, + SID_UID_CACHE, + GID_SID_CACHE, + SID_GID_CACHE, + GETWD_CACHE, + GETPWNAM_CACHE, + MANGLE_HASH2_CACHE +}; + +struct memcache *memcache_init(TALLOC_CTX *mem_ctx, size_t max_size); + +void memcache_add(struct memcache *cache, enum memcache_number n, + DATA_BLOB key, DATA_BLOB value); + +void memcache_delete(struct memcache *cache, enum memcache_number n, + DATA_BLOB key); + +bool memcache_lookup(struct memcache *cache, enum memcache_number n, + DATA_BLOB key, DATA_BLOB *value); + +void memcache_flush(struct memcache *cache, enum memcache_number n); + +#endif -- cgit