[PATCH 3/9] ksmbd-tools: use quotes for local includes

Linux CIFS filesystem development
 help / color / mirror / Atom feed

From: Enzo Matsumiya <ematsumiya@suse.de>
To: linux-cifs@vger.kernel.org, linkinjeon@kernel.org
Cc: senozhatsky@chromium.org, sergey.senozhatsky@gmail.com,
	hyc.lee@gmail.com, smfrench@gmail.com,
	Enzo Matsumiya <ematsumiya@suse.de>
Subject: [PATCH 3/9] ksmbd-tools: use quotes for local includes
Date: Sun,  6 Mar 2022 22:33:38 -0300	[thread overview]
Message-ID: <20220307013344.29064-4-ematsumiya@suse.de> (raw)
In-Reply-To: <20220307013344.29064-1-ematsumiya@suse.de>

Cosmetic only, but better practice.

Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
---
 daemon/ipc.c                 | 16 ++++++++--------
 daemon/rpc.c                 | 17 +++++++++--------
 daemon/rpc_lsarpc.c          | 13 +++++++------
 daemon/rpc_samr.c            | 13 +++++++------
 daemon/rpc_srvsvc.c          | 11 ++++++-----
 daemon/rpc_wkssvc.c          | 10 +++++-----
 daemon/smbacl.c              |  4 ++--
 daemon/worker.c              | 19 ++++++++++---------
 lib/config_parser.c          | 11 ++++++-----
 lib/ksmbdtools.c             |  2 +-
 lib/management/spnego.c      |  6 +++---
 lib/management/spnego_krb5.c |  4 ++--
 share/share_admin.c          | 12 +++++-------
 user/md4_hash.c              |  2 +-
 user/user_admin.c            | 16 +++++++---------
 15 files changed, 79 insertions(+), 77 deletions(-)

diff --git a/daemon/ipc.c b/daemon/ipc.c
index eded431e8112..c46cbc174175 100644
--- a/daemon/ipc.c
+++ b/daemon/ipc.c
@@ -15,14 +15,14 @@
 #include <linux/genetlink.h>
 #include <netlink/genl/mngt.h>
 
-#include <linux/ksmbd_server.h>
-
-#include <ksmbdtools.h>
-#include <ipc.h>
-#include <worker.h>
-#include <config_parser.h>
-#include <management/user.h>
-#include <management/share.h>
+#include "linux/ksmbd_server.h"
+
+#include "ksmbdtools.h"
+#include "ipc.h"
+#include "worker.h"
+#include "config_parser.h"
+#include "management/user.h"
+#include "management/share.h"
 
 static struct nl_sock *sk;
 
diff --git a/daemon/rpc.c b/daemon/rpc.c
index 2361634f1a55..ab2a7c6dfebe 100644
--- a/daemon/rpc.c
+++ b/daemon/rpc.c
@@ -9,14 +9,15 @@
 #include <endian.h>
 #include <glib.h>
 #include <errno.h>
-#include <linux/ksmbd_server.h>
-
-#include <rpc.h>
-#include <rpc_srvsvc.h>
-#include <rpc_wkssvc.h>
-#include <rpc_samr.h>
-#include <rpc_lsarpc.h>
-#include <ksmbdtools.h>
+
+#include "linux/ksmbd_server.h"
+
+#include "rpc.h"
+#include "rpc_srvsvc.h"
+#include "rpc_wkssvc.h"
+#include "rpc_samr.h"
+#include "rpc_lsarpc.h"
+#include "ksmbdtools.h"
 
 static GHashTable	*pipes_table;
 static GRWLock		pipes_table_lock;
diff --git a/daemon/rpc_lsarpc.c b/daemon/rpc_lsarpc.c
index 5caf4d9ef3ac..23fc68c3810b 100644
--- a/daemon/rpc_lsarpc.c
+++ b/daemon/rpc_lsarpc.c
@@ -10,13 +10,14 @@
 #include <glib.h>
 #include <pwd.h>
 #include <errno.h>
-#include <linux/ksmbd_server.h>
 
-#include <management/user.h>
-#include <rpc.h>
-#include <rpc_lsarpc.h>
-#include <smbacl.h>
-#include <ksmbdtools.h>
+#include "linux/ksmbd_server.h"
+
+#include "management/user.h"
+#include "rpc.h"
+#include "rpc_lsarpc.h"
+#include "smbacl.h"
+#include "ksmbdtools.h"
 
 #define LSARPC_OPNUM_DS_ROLE_GET_PRIMARY_DOMAIN_INFO	0
 #define LSARPC_OPNUM_OPEN_POLICY2			44
diff --git a/daemon/rpc_samr.c b/daemon/rpc_samr.c
index 95c607c101a3..396e38f58013 100644
--- a/daemon/rpc_samr.c
+++ b/daemon/rpc_samr.c
@@ -9,13 +9,14 @@
 #include <endian.h>
 #include <glib.h>
 #include <errno.h>
-#include <linux/ksmbd_server.h>
 
-#include <management/user.h>
-#include <rpc.h>
-#include <rpc_samr.h>
-#include <smbacl.h>
-#include <ksmbdtools.h>
+#include "linux/ksmbd_server.h"
+
+#include "management/user.h"
+#include "rpc.h"
+#include "rpc_samr.h"
+#include "smbacl.h"
+#include "ksmbdtools.h"
 
 #define SAMR_OPNUM_CONNECT5		64
 #define SAMR_OPNUM_ENUM_DOMAIN		6
diff --git a/daemon/rpc_srvsvc.c b/daemon/rpc_srvsvc.c
index f3b4d069031a..c3ec1c2bccd5 100644
--- a/daemon/rpc_srvsvc.c
+++ b/daemon/rpc_srvsvc.c
@@ -9,13 +9,14 @@
 #include <endian.h>
 #include <glib.h>
 #include <errno.h>
-#include <linux/ksmbd_server.h>
 
-#include <management/share.h>
+#include "linux/ksmbd_server.h"
+ 
+#include "management/share.h"
 
-#include <rpc.h>
-#include <rpc_srvsvc.h>
-#include <ksmbdtools.h>
+#include "rpc.h"
+#include "rpc_srvsvc.h"
+#include "ksmbdtools.h"
 
 #define SHARE_TYPE_TEMP			0x40000000
 #define SHARE_TYPE_HIDDEN		0x80000000
diff --git a/daemon/rpc_wkssvc.c b/daemon/rpc_wkssvc.c
index 32b7893eb2c6..a84f99b41888 100644
--- a/daemon/rpc_wkssvc.c
+++ b/daemon/rpc_wkssvc.c
@@ -9,13 +9,13 @@
 #include <endian.h>
 #include <glib.h>
 #include <errno.h>
-#include <linux/ksmbd_server.h>
 
-#include <management/share.h>
+#include "linux/ksmbd_server.h"
 
-#include <rpc.h>
-#include <rpc_wkssvc.h>
-#include <ksmbdtools.h>
+#include "management/share.h"
+#include "rpc.h"
+#include "rpc_wkssvc.h"
+#include "ksmbdtools.h"
 
 #define WKSSVC_NETWKSTA_GET_INFO	(0)
 
diff --git a/daemon/smbacl.c b/daemon/smbacl.c
index 66531c3bebea..a0ce2878fa18 100644
--- a/daemon/smbacl.c
+++ b/daemon/smbacl.c
@@ -6,8 +6,8 @@
  *   Author(s): Namjae Jeon (linkinjeon@kernel.org)
  */
 
-#include <smbacl.h>
-#include <ksmbdtools.h>
+#include "smbacl.h"
+#include "ksmbdtools.h"
 #include <glib.h>
 #include <glib/gprintf.h>
 
diff --git a/daemon/worker.c b/daemon/worker.c
index 70f2655b36c3..0ddd88cea12c 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -7,17 +7,18 @@
 #include <memory.h>
 #include <glib.h>
 #include <errno.h>
-#include <linux/ksmbd_server.h>
 
-#include <ksmbdtools.h>
-#include <worker.h>
-#include <ipc.h>
-#include <rpc.h>
+#include "linux/ksmbd_server.h"
 
-#include <management/user.h>
-#include <management/share.h>
-#include <management/tree_conn.h>
-#include <management/spnego.h>
+#include "ksmbdtools.h"
+#include "worker.h"
+#include "ipc.h"
+#include "rpc.h"
+
+#include "management/user.h"
+#include "management/share.h"
+#include "management/tree_conn.h"
+#include "management/spnego.h"
 
 #define MAX_WORKER_THREADS	4
 static GThreadPool *pool;
diff --git a/lib/config_parser.c b/lib/config_parser.c
index aa1dbf2a403e..20e27c3ab8ec 100644
--- a/lib/config_parser.c
+++ b/lib/config_parser.c
@@ -12,12 +12,13 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <linux/ksmbd_server.h>
 
-#include <config_parser.h>
-#include <ksmbdtools.h>
-#include <management/user.h>
-#include <management/share.h>
+#include "linux/ksmbd_server.h"
+
+#include "config_parser.h"
+#include "ksmbdtools.h"
+#include "management/user.h"
+#include "management/share.h"
 
 struct smbconf_global global_conf;
 struct smbconf_parser parser;
diff --git a/lib/ksmbdtools.c b/lib/ksmbdtools.c
index b636f34af98e..126b20c6a56a 100644
--- a/lib/ksmbdtools.c
+++ b/lib/ksmbdtools.c
@@ -13,7 +13,7 @@
 #include <fcntl.h>
 
 #include <stdio.h>
-#include <ksmbdtools.h>
+#include "ksmbdtools.h"
 
 static const char *app_name = "unknown";
 static int log_open;
diff --git a/lib/management/spnego.c b/lib/management/spnego.c
index 473caf66e036..685d88beebc3 100644
--- a/lib/management/spnego.c
+++ b/lib/management/spnego.c
@@ -19,9 +19,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <linux/ksmbd_server.h>
-#include <management/spnego.h>
-#include <asn1.h>
+#include "linux/ksmbd_server.h"
+#include "management/spnego.h"
+#include "asn1.h"
 #include "spnego_mech.h"
 
 static struct spnego_mech_ctx mech_ctxs[SPNEGO_MAX_MECHS];
diff --git a/lib/management/spnego_krb5.c b/lib/management/spnego_krb5.c
index 4bf7585bfb09..9e1516642145 100644
--- a/lib/management/spnego_krb5.c
+++ b/lib/management/spnego_krb5.c
@@ -15,8 +15,8 @@
 #include <netdb.h>
 #include <krb5.h>
 
-#include <management/spnego.h>
-#include <asn1.h>
+#include "management/spnego.h"
+#include "asn1.h"
 #include "spnego_mech.h"
 
 struct spnego_krb5_ctx {
diff --git a/share/share_admin.c b/share/share_admin.c
index 8365f872d620..0ff13d8017dd 100644
--- a/share/share_admin.c
+++ b/share/share_admin.c
@@ -13,13 +13,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <config_parser.h>
-#include <ksmbdtools.h>
-
-#include <management/share.h>
-
-#include <linux/ksmbd_server.h>
-#include <share_admin.h>
+#include "config_parser.h"
+#include "ksmbdtools.h"
+#include "management/share.h"
+#include "linux/ksmbd_server.h"
+#include "share_admin.h"
 
 static int conf_fd = -1;
 static char wbuf[16384];
diff --git a/user/md4_hash.c b/user/md4_hash.c
index 1dd4f61ac82a..3ef0996557c8 100644
--- a/user/md4_hash.c
+++ b/user/md4_hash.c
@@ -19,8 +19,8 @@
 
 #include <stdlib.h>
 #include <memory.h>
-#include <md4_hash.h>
 #include <asm/byteorder.h>
+#include "md4_hash.h"
 
 #define u8 unsigned char
 #define u32 unsigned int
diff --git a/user/user_admin.c b/user/user_admin.c
index 4e8591517c48..95b05ea33f28 100644
--- a/user/user_admin.c
+++ b/user/user_admin.c
@@ -14,15 +14,13 @@
 #include <fcntl.h>
 #include <termios.h>
 
-#include <config_parser.h>
-#include <ksmbdtools.h>
-
-#include <md4_hash.h>
-#include <user_admin.h>
-#include <management/user.h>
-#include <management/share.h>
-
-#include <linux/ksmbd_server.h>
+#include "config_parser.h"
+#include "ksmbdtools.h"
+#include "md4_hash.h"
+#include "user_admin.h"
+#include "management/user.h"
+#include "management/share.h"
+#include "linux/ksmbd_server.h"
 
 #define MAX_NT_PWD_LEN 129
 
-- 
2.34.1

next prev parent reply	other threads:[~2022-03-07  1:34 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-07  1:33 [PATCH 0/9] Unify all programs into a single binary "ksmbdctl" Enzo Matsumiya
2022-03-07  1:33 ` [PATCH 1/9] ksmbd-tools: rename dirs to reflect new commands Enzo Matsumiya
2022-03-07  1:33 ` [PATCH 2/9] ksmbd-tools: move control functions to daemon Enzo Matsumiya
2022-03-07  1:33 ` Enzo Matsumiya [this message]
2022-03-07  1:33 ` [PATCH 4/9] share: introduce share_cmd Enzo Matsumiya
2022-03-10  2:19   ` Namjae Jeon
2022-03-07  1:33 ` [PATCH 5/9] user: introduce user_cmd Enzo Matsumiya
2022-03-10  2:17   ` Namjae Jeon
2022-03-07  1:33 ` [PATCH 6/9] daemon: introduce daemon_cmd Enzo Matsumiya
2022-03-07  1:33 ` [PATCH 7/9] daemon/rpc_samr: drop unused function rpc_samr_remove_domain_entry() Enzo Matsumiya
2022-03-07  1:33 ` [PATCH 8/9] Unify all programs into a single binary "ksmbdctl" Enzo Matsumiya
2022-03-07  1:33 ` [PATCH 9/9] README: change to markdown, updates for ksmbdctl Enzo Matsumiya
2022-03-10  2:11 ` [PATCH 0/9] Unify all programs into a single binary "ksmbdctl" Namjae Jeon

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:eded431e811 dfblob:c46cbc17417 dfblob:2361634f1a5
dfblob:ab2a7c6dfeb dfblob:5caf4d9ef3a dfblob:23fc68c3810
dfblob:95c607c101a dfblob:396e38f5801 dfblob:f3b4d069031
dfblob:c3ec1c2bccd dfblob:32b7893eb2c dfblob:a84f99b4188
dfblob:66531c3bebe dfblob:a0ce2878fa1 dfblob:70f2655b36c
dfblob:0ddd88cea12 dfblob:aa1dbf2a403 dfblob:20e27c3ab8e
dfblob:b636f34af98 dfblob:126b20c6a56 dfblob:473caf66e03
dfblob:685d88beebc dfblob:4bf7585bfb0 dfblob:9e151664214
dfblob:8365f872d62 dfblob:0ff13d8017d dfblob:1dd4f61ac82
dfblob:3ef0996557c dfblob:4e8591517c4 dfblob:95b05ea33f2 )
 OR (
bs:"[PATCH 3/9] ksmbd-tools: use quotes for local includes" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220307013344.29064-4-ematsumiya@suse.de \
    --to=ematsumiya@suse.de \
    --cc=hyc.lee@gmail.com \
    --cc=linkinjeon@kernel.org \
    --cc=linux-cifs@vger.kernel.org \
    --cc=senozhatsky@chromium.org \
    --cc=sergey.senozhatsky@gmail.com \
    --cc=smfrench@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox