summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2020-03-25 22:06:37 +0100
committerRalph Boehme <slow@samba.org>2020-04-08 14:46:39 +0000
commitfbf55d124dc03b6b0bfe434bd6a121d8e2e1d562 (patch)
treeb4b3d11941d353020af5d8cb022864f6b57c1e32
parent3ab9caae3379fcc37df716ef83be593bee0e8a43 (diff)
downloadsamba-fbf55d124dc03b6b0bfe434bd6a121d8e2e1d562.tar.gz
libsmb: Remove a typedef
No API change, this is not used publically Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
-rw-r--r--source3/include/libsmb_internal.h4
-rw-r--r--source3/libsmb/libsmb_xattr.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h
index feedddd0877..d23b33c43b9 100644
--- a/source3/include/libsmb_internal.h
+++ b/source3/include/libsmb_internal.h
@@ -38,7 +38,7 @@
/*
* DOS Attribute values (used internally)
*/
-typedef struct DOS_ATTR_DESC {
+struct DOS_ATTR_DESC {
int mode;
off_t size;
time_t create_time;
@@ -46,7 +46,7 @@ typedef struct DOS_ATTR_DESC {
time_t write_time;
time_t change_time;
SMB_INO_T inode;
-} DOS_ATTR_DESC;
+};
/*
* Extension of libsmbclient.h's #defines
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index 8dde8c1bc90..9e3f542b924 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -544,16 +544,16 @@ done:
/* Obtain the current dos attributes */
-static DOS_ATTR_DESC *
+static struct DOS_ATTR_DESC *
dos_attr_query(SMBCCTX *context,
TALLOC_CTX *ctx,
const char *filename,
SMBCSRV *srv)
{
struct stat sb = {0};
- DOS_ATTR_DESC *ret;
+ struct DOS_ATTR_DESC *ret = NULL;
- ret = talloc(ctx, DOS_ATTR_DESC);
+ ret = talloc(ctx, struct DOS_ATTR_DESC);
if (!ret) {
errno = ENOMEM;
return NULL;
@@ -582,7 +582,7 @@ dos_attr_query(SMBCCTX *context,
/* parse a ascii version of a security descriptor */
static void
dos_attr_parse(SMBCCTX *context,
- DOS_ATTR_DESC *dad,
+ struct DOS_ATTR_DESC *dad,
SMBCSRV *srv,
char *str)
{
@@ -1698,7 +1698,7 @@ SMBC_setxattr_ctx(SMBCCTX *context,
char *password = NULL;
char *workgroup = NULL;
char *path = NULL;
- DOS_ATTR_DESC *dad = NULL;
+ struct DOS_ATTR_DESC *dad = NULL;
struct {
const char * create_time_attr;
const char * access_time_attr;