sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

More pstring/fstring removal.

Browse Source 
Jeremy.
(This used to be commit 7646f4b284403c18b22ca5cc7de4a57ba571183e)
This commit is contained in:
Jeremy Allison 2007-11-08 19:00:10 -08:00
parent 5f4693d8f8
commit 3f006ca95a
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source3/lib/util.c
View File

@ -1434,21 +1434,21 @@ const char *uidtoname(uid_t uid)
char *gidtoname(gid_t gid) char *gidtoname(gid_t gid)
{ {
fstring name;
struct group *grp; struct group *grp;
grp = getgrgid(gid); grp = getgrgid(gid);
if (grp) { if (grp) {
fstrcpy(name, grp->gr_name); return talloc_strdup(talloc_tos(), grp->gr_name);
} }
else { else {
slprintf(name,sizeof(name) - 1, "%d",(int)gid); return talloc_asprintf(talloc_tos(),
"%d",
(int)gid);
} }
return talloc_strdup(talloc_tos(), name);
} }
/******************************************************************* /*******************************************************************
Convert a user name into a uid. Convert a user name into a uid.
********************************************************************/ ********************************************************************/
uid_t nametouid(const char *name) uid_t nametouid(const char *name)
@ -2466,7 +2466,7 @@ char *state_path(const char *name)
const char *shlib_ext(void) const char *shlib_ext(void)
{ {
return dyn_SHLIBEXT; return dyn_SHLIBEXT;
} }
/******************************************************************* /*******************************************************************
@ -2963,18 +2963,23 @@ struct server_id interpret_pid(const char *pid_string)
char *procid_str(TALLOC_CTX *mem_ctx, const struct server_id *pid) char *procid_str(TALLOC_CTX *mem_ctx, const struct server_id *pid)
{ {
fstring str;
#ifdef CLUSTER_SUPPORT #ifdef CLUSTER_SUPPORT
if (pid->vnn == NONCLUSTER_VNN) { if (pid->vnn == NONCLUSTER_VNN) {
fstr_sprintf(str, "%d", (int)pid->pid); return talloc_asprintf(mem_ctx,
"%d",
(int)pid->pid);
} }
else { else {
fstr_sprintf(str, "%u:%d", (unsigned)pid->vnn, (int)pid->pid); return talloc_asprintf(mem_ctx,
"%u:%d",
(unsigned)pid->vnn,
(int)pid->pid);
} }
#else #else
fstr_sprintf(str, "%d", (int)pid->pid); return talloc_asprintf(mem_ctx,
"%d",
(int)pid->pid);
#endif #endif
return talloc_strdup(mem_ctx, str);
} }
char *procid_str_static(const struct server_id *pid) char *procid_str_static(const struct server_id *pid)