ncurses 6.1 - patch 20190121

[ncurses.git] / ncurses / trace / lib_trace.c

diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index 519a5ca90dcda6d4bb69b9719624255a8e577561..eda50085c6ddabb7efd7f84724cb55858f5860ac 100644 (file)
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -47,7 +47,7 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_trace.c,v 1.87 2018/06/24 00:06:37 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.91 2019/01/21 14:51:38 tom Exp $")

 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 


@@ -219,7 +219,7 @@ _nc_va_tracef(const char *fmt, va_list ap)
 }
 
 NCURSES_EXPORT(void)
 }
 
 NCURSES_EXPORT(void)

-_tracef(const char *fmt,...)
+_tracef(const char *fmt, ...)

 {
     va_list ap;
 
 {
     va_list ap;
 


@@ -308,6 +308,39 @@ _nc_retrace_win(WINDOW *code)
     return code;
 }
 
     return code;
 }
 

+NCURSES_EXPORT(char *)
+_nc_fmt_funcptr(char *target, const char *source, size_t size)
+{
+    size_t n;
+    char *dst = target;
+    bool leading = TRUE;
+
+    union {
+       int value;
+       char bytes[sizeof(int)];
+    } byteorder;
+
+    byteorder.value = 0x1234;
+
+    *dst++ = '0';
+    *dst++ = 'x';
+
+    for (n = 0; n < size; ++n) {
+       unsigned ch = ((byteorder.bytes[0] == 0x34)
+                      ? UChar(source[size - n - 1])
+                      : UChar(source[n]));
+       if (ch != 0 || (n + 1) >= size)
+           leading = FALSE;
+       if (!leading) {
+           _nc_SPRINTF(dst, _nc_SLIMIT(TR_FUNC_LEN - (dst - target))
+                       "%02x", ch & 0xff);
+           dst += 2;
+       }
+    }
+    *dst = '\0';
+    return target;
+}
+

 #if USE_REENTRANT
 /*
  * Check if the given trace-mask is enabled.
 #if USE_REENTRANT
 /*
  * Check if the given trace-mask is enabled.


@@ -343,7 +376,7 @@ _nc_use_tracef(unsigned mask)
  * the tracef mutex.
  */
 NCURSES_EXPORT(void)
  * the tracef mutex.
  */
 NCURSES_EXPORT(void)

-_nc_locked_tracef(const char *fmt,...)
+_nc_locked_tracef(const char *fmt, ...)

 {
     va_list ap;
 
 {
     va_list ap;