svn commit: samba r11379 - in branches/SAMBA_3_0/source/libsmb: .

[jra at samba.org]

Author: jra
Date: 2005-10-28 20:36:21 +0000 (Fri, 28 Oct 2005)
New Revision: 11379

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11379

Log:
Remove external dependencies from sharemodes library.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/smb_share_modes.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/smb_share_modes.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/smb_share_modes.c	2005-10-28 19:14:46 UTC (rev 11378)
+++ branches/SAMBA_3_0/source/libsmb/smb_share_modes.c	2005-10-28 20:36:21 UTC (rev 11379)
@@ -3,6 +3,12 @@
    Used by non-Samba products needing access to the Samba share mode db.
                                                                                                                                   
    Copyright (C) Jeremy Allison 2005.
+
+   sharemodes_procid functions (C) Copyright (C) Volker Lendecke 2005
+
+     ** NOTE! The following LGPL license applies to this module only.
+     ** This does NOT imply that all of Samba is released
+     ** under the LGPL
                                                                                                                                   
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -27,6 +33,16 @@
 #undef malloc
 #endif
 
+static BOOL sharemodes_procid_equal(const struct process_id *p1, const struct process_id *p2)
+{
+	return (p1->pid == p2->pid);
+}
+
+static pid_t sharemodes_procid_to_pid(const struct process_id *proc)
+{
+	return proc->pid;
+}
+
 /*
  * open/close sharemode database.
  */
@@ -122,7 +138,7 @@
 
 static int share_mode_entry_equal(const struct smb_share_mode_entry *e_entry, const struct share_mode_entry *entry)
 {
-	return (procid_equal(&e_entry->pid, &entry->pid) &&
+	return (sharemodes_procid_equal(&e_entry->pid, &entry->pid) &&
 		e_entry->file_id == (uint32_t)entry->share_file_id &&
 		e_entry->open_time.tv_sec == entry->time.tv_sec &&
 		e_entry->open_time.tv_usec == entry->time.tv_usec &&
@@ -202,7 +218,7 @@
 		struct process_id pid = share->pid;
 
 		/* Check this process really exists. */
-		if (kill(procid_to_pid(&pid), 0) == -1 && (errno == ESRCH)) {
+		if (kill(sharemodes_procid_to_pid(&pid), 0) == -1 && (errno == ESRCH)) {
 			continue; /* No longer exists. */
 		}
 
@@ -372,7 +388,7 @@
 		struct process_id pid = share->pid;
 
 		/* Check this process really exists. */
-		if (kill(procid_to_pid(&pid), 0) == -1 && (errno == ESRCH)) {
+		if (kill(sharemodes_procid_to_pid(&pid), 0) == -1 && (errno == ESRCH)) {
 			continue; /* No longer exists. */
 		}
 
@@ -447,7 +463,7 @@
 		struct process_id pid = share->pid;
 
 		/* Check this process really exists. */
-		if (kill(procid_to_pid(&pid), 0) == -1 && (errno == ESRCH)) {
+		if (kill(sharemodes_procid_to_pid(&pid), 0) == -1 && (errno == ESRCH)) {
 			continue; /* No longer exists. */
 		}