summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>2010-09-30 10:28:53 -0700
committerInaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>2010-09-30 10:28:53 -0700
commit5fba48d5bd0b8a64d0946a5da4a4980893ccd818 (patch)
tree463be9bc83be5f7205e64c9aeae94aa9fcaab3c2
parent7d95c86f19a6ae4fa51badc9c1b85715567e7d79 (diff)
wimaxll_vmsg: remove deprecated code that was causing trouble in ARM
The deprecated code casted a NULL to a va_list, which is ok in x86 but not in ARM. Since it is deprecated and none used it, just kill it. Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
-rw-r--r--include/wimaxll.h10
-rw-r--r--lib/log.c7
-rw-r--r--lib/wimax.c45
3 files changed, 0 insertions, 62 deletions
diff --git a/include/wimaxll.h b/include/wimaxll.h
index 24e7250..c9dde3f 100644
--- a/include/wimaxll.h
+++ b/include/wimaxll.h
@@ -348,16 +348,6 @@ ssize_t wimaxll_wait_for_state_change(struct wimaxll_handle *wmx,
enum wimax_st *old_state,
enum wimax_st *new_state);
-/*
- * Basic diagnostics
- *
- * Deprecated, see wimaxll/log.h
- */
-extern void (*wimaxll_vmsg)(const char *, va_list)
- __attribute__((deprecated));
-void wimaxll_vmsg_stderr(const char *, va_list)
- __attribute__((deprecated));
-
/**
* \defgroup miscellaneous_group Miscellaneous utilities
diff --git a/lib/log.c b/lib/log.c
index 9d85988..87085c5 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -62,13 +62,6 @@ void wimaxll_vlmsg_default(struct wimaxll_handle *wmx, unsigned level,
{
FILE *f = level != W_PRINT? stderr : stdout;
- /* Backwards compat */
- if (wimaxll_vmsg) {
- if (header)
- wimaxll_vmsg(header, NULL);
- wimaxll_vmsg(fmt, vargs);
- return;
- }
if (level == W_PRINT)
f = stdout;
else {
diff --git a/lib/wimax.c b/lib/wimax.c
index f56fff0..f82e731 100644
--- a/lib/wimax.c
+++ b/lib/wimax.c
@@ -211,51 +211,6 @@ void wimaxll_vmsg_stderr(const char *fmt, va_list vargs)
}
-
-/**
- * Print library diagnostics messages [backend]
- *
- * \deprecated { use wimaxll_vlmsg_cb }
- *
- * @param fmt printf-like format
- * @param vargs variable-argument list as created by
- * stdargs.h:va_list() that will be formatted according to \e
- * fmt.
- *
- * Prints/writes the \e libwimaxll's diagnostics messages to a
- * destination as selected by the user of the library.
- *
- * \note This function pointer must be set \b before calling any other
- * \e libwimaxll function.
- *
- * By default, diagnostics are printed with wimaxll_vmsg_stderr() to
- * \a stderr.
- *
- * For example, to deliver diagnostics to syslog:
- *
- * @code
- * #include <syslog.h>
- * ...
- * static
- * void wimaxll_vmsg_syslog(const char *fmt, va_list vargs)
- * {
- * vsyslog(LOG_MAKEPRI(LOG_USER, LOG_INFO), fmt, vargs);
- * }
- * ...
- * wimaxll_vmsg = wimaxll_vmsg_syslog();
- * ...
- * wimaxll_open(BLAH);
- * @endcode
- *
- * \ingroup diagnostics_group
- * \internal
- *
- * The internal function wimaxll_msg() is used as as a frontend to
- * this function.
- */
-void (*wimaxll_vmsg)(const char *fmt, va_list vargs) = NULL;
-
-
/**
* Return the name of a the system's WiMAX interface associated to an
* open handle