* gnutls.c, gnutls.h (emacs_gnutls_record_check_pending):

Return ptrdiff_t, not int, since it's a buffer size.
Reindent/reparen some macros to a more Gnuish style.

3 files changed, 26 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7bbcb345a0f..0ffa9af77fc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * gnutls.c, gnutls.h (emacs_gnutls_record_check_pending):
+        Return ptrdiff_t, not int, since it's a buffer size.
+        Reindent/reparen some macros to a more Gnuish style.
+
 2013-12-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         Avoid undefined behavior with huge regexp interval counts.
diff --git a/src/gnutls.c b/src/gnutls.c
index 9ea3f59100d..105e5071ed7 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -365,7 +365,7 @@ emacs_gnutls_handshake (struct Lisp_Process *proc)
   return ret;
 }
 
-int
+ptrdiff_t
 emacs_gnutls_record_check_pending (gnutls_session_t state)
 {
   return fn_gnutls_record_check_pending (state);
diff --git a/src/gnutls.h b/src/gnutls.h
index 0f648dbd81c..4adaad4897d 100644
--- a/src/gnutls.h
+++ b/src/gnutls.h
@@ -45,25 +45,38 @@ typedef enum
   GNUTLS_STAGE_READY
 } gnutls_initstage_t;
 
-#define GNUTLS_EMACS_ERROR_NOT_LOADED GNUTLS_E_APPLICATION_ERROR_MIN + 1
+#define GNUTLS_EMACS_ERROR_NOT_LOADED (GNUTLS_E_APPLICATION_ERROR_MIN + 1)
 #define GNUTLS_EMACS_ERROR_INVALID_TYPE GNUTLS_E_APPLICATION_ERROR_MIN
 
 #define GNUTLS_INITSTAGE(proc) (XPROCESS (proc)->gnutls_initstage)
 
-#define GNUTLS_PROCESS_USABLE(proc) (GNUTLS_INITSTAGE(proc) >= GNUTLS_STAGE_READY)
+#define GNUTLS_PROCESS_USABLE(proc) \
+  (GNUTLS_INITSTAGE (proc) >= GNUTLS_STAGE_READY)
 
-#define GNUTLS_LOG(level, max, string) do { if (level <= max) { gnutls_log_function (level, "(Emacs) " string); } } while (0)
+#define GNUTLS_LOG(level, max, string)                          \
+  do {                                                          \
+    if ((level) <= (max))                                       \
+      gnutls_log_function (level, "(Emacs) " string);           \
+  } while (0)
 
-#define GNUTLS_LOG2(level, max, string, extra) do { if (level <= max) { gnutls_log_function2 (level, "(Emacs) " string, extra); } } while (0)
+#define GNUTLS_LOG2(level, max, string, extra)                  \
+  do {                                                          \
+    if ((level) <= (max))                                       \
+      gnutls_log_function2 (level, "(Emacs) " string, extra);   \
+  } while (0)
 
-#define GNUTLS_LOG2i(level, max, string, extra) do { if (level <= max) { gnutls_log_function2i (level, "(Emacs) " string, extra); } } while (0)
+#define GNUTLS_LOG2i(level, max, string, extra)                 \
+  do {                                                          \
+    if ((level) <= (max))                                       \
+      gnutls_log_function2i (level, "(Emacs) " string, extra);  \
+  } while (0)
 
 extern ptrdiff_t
 emacs_gnutls_write (struct Lisp_Process *proc, const char *buf, ptrdiff_t nbyte);
 extern ptrdiff_t
 emacs_gnutls_read (struct Lisp_Process *proc, char *buf, ptrdiff_t nbyte);
 
-extern int emacs_gnutls_record_check_pending (gnutls_session_t state);
+extern ptrdiff_t emacs_gnutls_record_check_pending (gnutls_session_t state);
 #ifdef WINDOWSNT
 extern void emacs_gnutls_transport_set_errno (gnutls_session_t state, int err);
 #endif