-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006, 2010, 2011 Free Software Foundation, Inc.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
*
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice. */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
\f
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
#include "libguile/strings.h"
#include "libguile/ports.h"
-/* Windows defines. */
-#ifdef __MINGW32__
-#define vsnprintf _vsnprintf
-#endif
+#include "libguile/private-options.h"
\f
-#if (SCM_ENABLE_DEPRECATED == 1)
-
struct issued_warning {
struct issued_warning *prev;
const char *message;
};
+static scm_i_pthread_mutex_t warn_lock = SCM_I_PTHREAD_MUTEX_INITIALIZER;
static struct issued_warning *issued_warnings;
-static enum { detailed, summary, summary_print } mode;
+static int print_summary = 0;
void
scm_c_issue_deprecation_warning (const char *msg)
{
- if (mode != detailed)
- mode = summary_print;
+ if (!SCM_WARN_DEPRECATED)
+ print_summary = 1;
else
{
struct issued_warning *iw;
+
+ scm_i_pthread_mutex_lock (&warn_lock);
for (iw = issued_warnings; iw; iw = iw->prev)
if (!strcmp (iw->message, msg))
- return;
- if (scm_gc_running_p)
- fprintf (stderr, "%s\n", msg);
- else
- {
- scm_puts (msg, scm_current_error_port ());
- scm_newline (scm_current_error_port ());
- }
- msg = strdup (msg);
- iw = malloc (sizeof (struct issued_warning));
- if (msg == NULL || iw == NULL)
- return;
- iw->message = msg;
- iw->prev = issued_warnings;
- issued_warnings = iw;
+ {
+ msg = NULL;
+ break;
+ }
+ if (msg)
+ {
+ msg = strdup (msg);
+ iw = malloc (sizeof (struct issued_warning));
+ if (msg == NULL || iw == NULL)
+ /* Nothing sensible to do if you can't allocate this small
+ amount of memory. */
+ abort ();
+ iw->message = msg;
+ iw->prev = issued_warnings;
+ issued_warnings = iw;
+ }
+ scm_i_pthread_mutex_unlock (&warn_lock);
+
+ /* All this dance is to avoid printing to a port inside a mutex,
+ which could recurse and deadlock. */
+ if (msg)
+ {
+ if (scm_gc_running_p)
+ fprintf (stderr, "%s\n", msg);
+ else
+ {
+ scm_puts (msg, scm_current_warning_port ());
+ scm_newline (scm_current_warning_port ());
+ }
+ }
}
}
va_start (ap, msg);
vsnprintf (buf, 511, msg, ap);
+ va_end (ap);
buf[511] = '\0';
scm_c_issue_deprecation_warning (buf);
}
"they are printed in turn, each one followed by a newline.")
#define FUNC_NAME s_scm_issue_deprecation_warning
{
- if (mode != detailed)
- mode = summary_print;
+ if (!SCM_WARN_DEPRECATED)
+ print_summary = 1;
else
{
- SCM nl = scm_str2string ("\n");
+ SCM nl = scm_from_locale_string ("\n");
SCM msgs_nl = SCM_EOL;
- while (SCM_CONSP (msgs))
+ char *c_msgs;
+ while (scm_is_pair (msgs))
{
- if (msgs_nl != SCM_EOL)
+ if (!scm_is_null (msgs_nl))
msgs_nl = scm_cons (nl, msgs_nl);
msgs_nl = scm_cons (SCM_CAR (msgs), msgs_nl);
msgs = SCM_CDR (msgs);
}
msgs_nl = scm_string_append (scm_reverse_x (msgs_nl, SCM_EOL));
- scm_c_issue_deprecation_warning (SCM_STRING_CHARS (msgs_nl));
- scm_remember_upto_here_1 (msgs_nl);
+ c_msgs = scm_to_locale_string (msgs_nl);
+ scm_c_issue_deprecation_warning (c_msgs);
+ free (c_msgs);
}
return SCM_UNSPECIFIED;
}
static void
print_deprecation_summary (void)
{
- if (mode == summary_print)
+ if (print_summary)
{
fputs ("\n"
"Some deprecated features have been used. Set the environment\n"
}
}
-#endif
-
SCM_DEFINE(scm_include_deprecated_features,
"include-deprecated-features", 0, 0, 0,
(),
"in public interfaces.")
#define FUNC_NAME s_scm_include_deprecated_features
{
- return SCM_BOOL (SCM_ENABLE_DEPRECATED == 1);
+ return scm_from_bool (SCM_ENABLE_DEPRECATED == 1);
}
#undef FUNC_NAME
void
scm_init_deprecation ()
{
-#if (SCM_ENABLE_DEPRECATED == 1)
const char *level = getenv ("GUILE_WARN_DEPRECATED");
if (level == NULL)
level = SCM_WARN_DEPRECATED_DEFAULT;
if (!strcmp (level, "detailed"))
- mode = detailed;
+ SCM_WARN_DEPRECATED = 1;
else if (!strcmp (level, "no"))
- mode = summary;
+ SCM_WARN_DEPRECATED = 0;
else
{
- mode = summary;
+ SCM_WARN_DEPRECATED = 0;
atexit (print_deprecation_summary);
}
-#endif
-#ifndef SCM_MAGIC_SNARFER
#include "libguile/deprecation.x"
-#endif
}
/*
Local Variables:
c-file-style: "gnu"
- End: */
+ End:
+ */
HCoop / bpt / guile.git / blobdiff