Commit 11dde529 authored by Paul Eggert's avatar Paul Eggert
Browse files

* 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.
parent b9e20952
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.
......
......@@ -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);
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment