summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-08-17 12:45:33 +0200
committerStefan Metzmacher <metze@samba.org>2012-08-17 20:07:07 +0200
commit6a58c5fc648088c7c8930a0e653c2f1b01a90b13 (patch)
tree4bfaa1e197f7304bdbc7550e7369eb1e6db89753
parent8149623ad4e07f03b92832972c6d36ada92cc810 (diff)
downloadsamba-6a58c5fc648088c7c8930a0e653c2f1b01a90b13.tar.gz
samba-6a58c5fc648088c7c8930a0e653c2f1b01a90b13.tar.bz2
samba-6a58c5fc648088c7c8930a0e653c2f1b01a90b13.zip
s3:lib: implement serverid_equal() as macro of server_id_equal()
metze
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/include/serverid.h2
-rw-r--r--source3/lib/serverid.c21
3 files changed, 1 insertions, 24 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9af72a190b..00dbab84ad 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -454,7 +454,7 @@ void set_my_unique_id(uint64_t unique_id);
struct server_id pid_to_procid(pid_t pid);
struct server_id procid_self(void);
struct server_id *new_server_id_task(TALLOC_CTX *mem_ctx);
-bool serverid_equal(const struct server_id *p1, const struct server_id *p2);
+#define serverid_equal(p1, p2) server_id_equal(p1,p2)
bool procid_is_me(const struct server_id *pid);
struct server_id interpret_pid(const char *pid_string);
char *procid_str_static(const struct server_id *pid);
diff --git a/source3/include/serverid.h b/source3/include/serverid.h
index ed8d17f95a..1833f53d55 100644
--- a/source3/include/serverid.h
+++ b/source3/include/serverid.h
@@ -75,6 +75,4 @@ bool serverid_parent_init(TALLOC_CTX *mem_ctx);
*/
uint64_t serverid_get_random_unique_id(void);
-bool serverid_equal(const struct server_id *p1, const struct server_id *p2);
-
#endif
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 3068d77a84..3c5402e3f3 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -458,24 +458,3 @@ uint64_t serverid_get_random_unique_id(void)
return unique_id;
}
-
-bool serverid_equal(const struct server_id *p1, const struct server_id *p2)
-{
- if (p1->pid != p2->pid) {
- return false;
- }
-
- if (p1->task_id != p2->task_id) {
- return false;
- }
-
- if (p1->vnn != p2->vnn) {
- return false;
- }
-
- if (p1->unique_id != p2->unique_id) {
- return false;
- }
-
- return true;
-}