OpenBSD, NetBSD: TLS preload

[users/heiko/exim.git] / src / exim_monitor / em_xs.c

diff --git a/src/exim_monitor/em_xs.c b/src/exim_monitor/em_xs.c
index a6fe64be3968d72d70ba7c802af68865bf4ecc44..ee91f7c159c06ff85e4754c6f6670fbc98e92590 100644 (file)
--- a/src/exim_monitor/em_xs.c
+++ b/src/exim_monitor/em_xs.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/exim_monitor/em_xs.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */
-

 /*************************************************
 *               Exim Monitor                     *
 *************************************************/
 
 /*************************************************
 *               Exim Monitor                     *
 *************************************************/
 

-/* Copyright (c) University of Cambridge, 1995 - 2005 */
+/* Copyright (c) University of Cambridge, 1995 - 2016 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This file contains a number of subroutines that are in effect
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This file contains a number of subroutines that are in effect


@@ -32,15 +30,16 @@ void xs_SetValues(Widget w, Cardinal num_args, ...)
 {
 int i;
 va_list ap;
 {
 int i;
 va_list ap;

-Arg *aa = (num_args > 15)? (Arg *)malloc(num_args*sizeof(Arg)) : xs_temparg;
+Arg *aa = (num_args > 15)? store_malloc(num_args*sizeof(Arg)) : xs_temparg;

 va_start(ap, num_args);
 for (i = 0; i < num_args; i++)
   {
   aa[i].name = va_arg(ap, String);
   aa[i].value = va_arg(ap, XtArgVal);
   }
 va_start(ap, num_args);
 for (i = 0; i < num_args; i++)
   {
   aa[i].name = va_arg(ap, String);
   aa[i].value = va_arg(ap, XtArgVal);
   }

+va_end(ap);

 XtSetValues(w, aa, num_args);
 XtSetValues(w, aa, num_args);

-if (num_args > 15) free(aa);
+if (num_args > 15) store_free(aa);

 }
 
 /* End of em_xs.c */
 }
 
 /* End of em_xs.c */