sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

g_lock: remove unused functions g_lock_put() and g_lock_record_store()

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2017-07-18 12:34:11 +02:00 committed by Ralph Boehme
parent 241f31dbd4
commit 145b9cbbf2
1 changed files with 0 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
source3/lib/g_lock.c
View File

@ -141,53 +141,6 @@ static NTSTATUS g_lock_store(struct db_record *rec, struct g_lock *lck,
return dbwrap_record_storev(rec, dbufs, ARRAY_SIZE(dbufs), 0);
}
#if 0
static ssize_t g_lock_put(uint8_t *buf, size_t buflen,
const struct g_lock_rec *locks,
size_t num_locks,
const uint8_t *data, size_t datalen)
{
size_t i, len, ofs;
if (num_locks > UINT32_MAX/G_LOCK_REC_LENGTH) {
return -1;
}
len = num_locks * G_LOCK_REC_LENGTH;
len += sizeof(uint32_t);
if (len < sizeof(uint32_t)) {
return -1;
}
len += datalen;
if (len < datalen) {
return -1;
}
if (len > buflen) {
return len;
}
ofs = 0;
SIVAL(buf, ofs, num_locks);
ofs += sizeof(uint32_t);
for (i=0; i<num_locks; i++) {
g_lock_rec_put(buf+ofs, locks[i]);
ofs += G_LOCK_REC_LENGTH;
}
if ((data != NULL) && (datalen != 0)) {
memcpy(buf+ofs, data, datalen);
}
return len;
}
#endif
static ssize_t g_lock_get(TDB_DATA recval,
struct g_lock_rec *locks, size_t num_locks,
uint8_t **data, size_t *datalen)
@ -312,39 +265,6 @@ static bool g_lock_conflicts(enum g_lock_type l1, enum g_lock_type l2)
return true;
}
#if 0
static NTSTATUS g_lock_record_store(struct db_record *rec,
const struct g_lock_rec *locks,
size_t num_locks,
const uint8_t *data, size_t datalen)
{
ssize_t len;
uint8_t *buf;
NTSTATUS status;
len = g_lock_put(NULL, 0, locks, num_locks, data, datalen);
if (len == -1) {
return NT_STATUS_BUFFER_TOO_SMALL;
}
buf = talloc_array(rec, uint8_t, len);
if (buf == NULL) {
return NT_STATUS_NO_MEMORY;
}
g_lock_put(buf, len, locks, num_locks, data, datalen);
status = dbwrap_record_store(
rec, (TDB_DATA) { .dptr = buf, .dsize = len }, 0);
TALLOC_FREE(buf);
return status;
}
#endif
static NTSTATUS g_lock_trylock(struct db_record *rec, struct server_id self,
enum g_lock_type type,
struct server_id *blocker)