From 5fba48d5bd0b8a64d0946a5da4a4980893ccd818 Mon Sep 17 00:00:00 2001 From: Inaky Perez-Gonzalez Date: Thu, 30 Sep 2010 10:28:53 -0700 Subject: 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 --- include/wimaxll.h | 10 ---------- lib/log.c | 7 ------- lib/wimax.c | 45 --------------------------------------------- 3 files changed, 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 - * ... - * 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 -- cgit v1.2.3