git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Turner <novalis@novalis.org>
To: git@vger.kernel.org, pclouds@gmail.com, kmaggg@gmail.com
Subject: [PATCH v14 03/21] unix-socket.c: add stub implementation when unix sockets are not supported
Date: Sun,  3 Jul 2016 03:57:55 -0400	[thread overview]
Message-ID: <1467532693-20017-4-git-send-email-novalis@novalis.org> (raw)
In-Reply-To: <1467532693-20017-1-git-send-email-novalis@novalis.org>

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

This keeps #ifdef at the callee instead of caller, it's less messier.

The caller in question is in read-cache.c which, unlike other
unix-socket callers so far, is always built regardless of unix socket
support. No extra handling (for ENOSYS) is needed because in this
build, index-helper does not exist, $GIT_DIR/index-helper.sock does
not exist, so no unix socket call is made by read-cache.c in the first
place.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 Makefile      |  2 ++
 unix-socket.h | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/Makefile b/Makefile
index 2742a69..7920609 100644
--- a/Makefile
+++ b/Makefile
@@ -1341,6 +1341,8 @@ ifndef NO_UNIX_SOCKETS
 	LIB_OBJS += unix-socket.o
 	PROGRAM_OBJS += credential-cache.o
 	PROGRAM_OBJS += credential-cache--daemon.o
+else
+	BASIC_CFLAGS += -DNO_UNIX_SOCKETS
 endif
 
 ifdef NO_ICONV
diff --git a/unix-socket.h b/unix-socket.h
index e271aee..f1cba70 100644
--- a/unix-socket.h
+++ b/unix-socket.h
@@ -1,7 +1,25 @@
 #ifndef UNIX_SOCKET_H
 #define UNIX_SOCKET_H
 
+#ifndef NO_UNIX_SOCKETS
+
 int unix_stream_connect(const char *path);
 int unix_stream_listen(const char *path);
 
+#else
+
+static inline int unix_stream_connect(const char *path)
+{
+	errno = ENOSYS;
+	return -1;
+}
+
+static inline int unix_stream_listen(const char *path)
+{
+	errno = ENOSYS;
+	return -1;
+}
+
+#endif
+
 #endif /* UNIX_SOCKET_H */
-- 
1.9.1


  parent reply	other threads:[~2016-07-03  7:58 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-03  7:57 [PATCH v14 00/21] index-helper/watchman David Turner
2016-07-03  7:57 ` [PATCH v14 01/21] read-cache: allow to keep mmap'd memory after reading David Turner
2016-07-03  7:57 ` [PATCH v14 02/21] pkt-line: add gentle version of packet_write David Turner
2016-07-03  7:57 ` David Turner [this message]
2016-07-03  7:57 ` [PATCH v14 04/21] index-helper: new daemon for caching index and related stuff David Turner
2016-07-03  7:57 ` [PATCH v14 05/21] index-helper: add --strict David Turner
2016-07-03  7:57 ` [PATCH v14 06/21] daemonize(): set a flag before exiting the main process David Turner
2016-07-03  7:57 ` [PATCH v14 07/21] index-helper: add --detach David Turner
2016-07-03  7:58 ` [PATCH v14 08/21] index-helper: log warnings David Turner
2016-07-03  7:58 ` [PATCH v14 09/21] read-cache: add watchman 'WAMA' extension David Turner
2016-07-03  7:58 ` [PATCH v14 10/21] watchman: support watchman to reduce index refresh cost David Turner
2016-07-03  7:58 ` [PATCH v14 11/21] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-07-03  7:58 ` [PATCH v14 12/21] update-index: enable/disable watchman support David Turner
2016-07-03  7:58 ` [PATCH v14 13/21] unpack-trees: preserve index extensions David Turner
2016-07-03  7:58 ` [PATCH v14 14/21] watchman: add a config option to enable the extension David Turner
2016-07-03  7:58 ` [PATCH v14 15/21] index-helper: kill mode David Turner
2016-07-06  8:20   ` Johannes Schindelin
2016-07-06 15:33     ` Duy Nguyen
2016-07-03  7:58 ` [PATCH v14 16/21] index-helper: don't run if already running David Turner
2016-07-03  7:58 ` [PATCH v14 17/21] index-helper: autorun mode David Turner
2016-07-03  7:58 ` [PATCH v14 18/21] index-helper: optionally automatically run David Turner
2016-07-03  7:58 ` [PATCH v14 19/21] trace: measure where the time is spent in the index-heavy operations David Turner
2016-07-03 11:51 ` [PATCH v14 00/21] index-helper/watchman Johannes Schindelin
2016-07-04  6:40   ` Johannes Schindelin
2016-07-06 18:11 ` Junio C Hamano
2016-07-12 18:24 ` Duy Nguyen
2016-07-13 21:59   ` David Turner
2016-07-14 15:56     ` Duy Nguyen
2016-07-14 15:58       ` Duy Nguyen
2016-07-15  1:20       ` Ben Peart

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=1467532693-20017-4-git-send-email-novalis@novalis.org \
    --to=novalis@novalis.org \
    --cc=git@vger.kernel.org \
    --cc=kmaggg@gmail.com \
    --cc=pclouds@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;
as well as URLs for NNTP newsgroup(s).