sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-28 07:21:54 +03:00
Code

had to move unistr2_dup(), unistr2_free() and unistr2_copy() into

Browse Source 
util_unistr.c in order to get bin/testparm to compile.
This commit is contained in:
Luke Leighton 0001-01-01 00:00:00 +00:00
parent a80ea2eb47
commit e718ce9c4a
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/lib/util_unistr.c
View File

@ -261,3 +261,37 @@ void buffer4_to_str(char *dest, const BUFFER4 *str, size_t maxlen)
*dest = 0; *dest = 0;
} }
/*******************************************************************
copies a UNISTR2 structure.
********************************************************************/
BOOL copy_unistr2(UNISTR2 *str, const UNISTR2 *from)
{
/* set up string lengths. add one if string is not null-terminated */
str->uni_max_len = from->uni_max_len;
str->undoc = from->undoc;
str->uni_str_len = from->uni_str_len;
/* copy the string */
memcpy(str->buffer, from->buffer, sizeof(from->buffer));
return True;
}
/*******************************************************************
duplicates a UNISTR2 structure.
********************************************************************/
UNISTR2 *unistr2_dup(const UNISTR2 *name)
{
UNISTR2 *copy = (UNISTR2*)malloc(sizeof(*copy));
copy_unistr2(copy, name);
return copy;
}
/*******************************************************************
frees a UNISTR2 structure.
********************************************************************/
void unistr2_free(UNISTR2 *name)
{
free(name);
}

34
source/rpc_parse/parse_misc.c
View File

@ -744,40 +744,6 @@ BOOL make_buf_unistr2(UNISTR2 *str, uint32 *ptr, char *buf)
return True; return True;
} }
/*******************************************************************
copies a UNISTR2 structure.
********************************************************************/
BOOL copy_unistr2(UNISTR2 *str, const UNISTR2 *from)
{
/* set up string lengths. add one if string is not null-terminated */
str->uni_max_len = from->uni_max_len;
str->undoc = from->undoc;
str->uni_str_len = from->uni_str_len;
/* copy the string */
memcpy(str->buffer, from->buffer, sizeof(from->buffer));
return True;
}
/*******************************************************************
duplicates a UNISTR2 structure.
********************************************************************/
UNISTR2 *unistr2_dup(const UNISTR2 *name)
{
UNISTR2 *copy = (UNISTR2*)malloc(sizeof(*copy));
copy_unistr2(copy, name);
return copy;
}
/*******************************************************************
frees a UNISTR2 structure.
********************************************************************/
void unistr2_free(UNISTR2 *name)
{
free(name);
}
/******************************************************************* /*******************************************************************
creates a STRING2 structure. creates a STRING2 structure.
********************************************************************/ ********************************************************************/