From 2a74440547ea0a15195224fa2b7784b267cbfe15 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Thu, 19 Jul 2012 17:29:34 -0300 Subject: [PATCH] qerror: reduce public exposure qerror will be dropped in a near future, let's reduce its public exposure by making functions only used in qerror.c static. Signed-off-by: Luiz Capitulino Reviewed-by: Markus Armbruster --- qerror.c | 10 +++++----- qerror.h | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/qerror.c b/qerror.c index de0a79e17d..bfb875a951 100644 --- a/qerror.c +++ b/qerror.c @@ -336,7 +336,7 @@ static const QErrorStringTable qerror_table[] = { * * Return strong reference. */ -QError *qerror_new(void) +static QError *qerror_new(void) { QError *qerr; @@ -424,8 +424,8 @@ static void qerror_set_desc(QError *qerr, const char *fmt) * * Return strong reference. */ -QError *qerror_from_info(const char *file, int linenr, const char *func, - const char *fmt, va_list *va) +static QError *qerror_from_info(const char *file, int linenr, const char *func, + const char *fmt, va_list *va) { QError *qerr; @@ -549,7 +549,7 @@ QString *qerror_human(const QError *qerror) * it uses error_report() for this, so that the output is routed to the right * place (ie. stderr or Monitor's device). */ -void qerror_print(QError *qerror) +static void qerror_print(QError *qerror) { QString *qstring = qerror_human(qerror); loc_push_restore(&qerror->loc); @@ -620,7 +620,7 @@ void assert_no_error(Error *err) /** * qobject_to_qerror(): Convert a QObject into a QError */ -QError *qobject_to_qerror(const QObject *obj) +static QError *qobject_to_qerror(const QObject *obj) { if (qobject_type(obj) != QTYPE_QERROR) { return NULL; diff --git a/qerror.h b/qerror.h index b4c8758f40..fe8870c062 100644 --- a/qerror.h +++ b/qerror.h @@ -33,11 +33,7 @@ typedef struct QError { const QErrorStringTable *entry; } QError; -QError *qerror_new(void); -QError *qerror_from_info(const char *file, int linenr, const char *func, - const char *fmt, va_list *va) GCC_FMT_ATTR(4, 0); QString *qerror_human(const QError *qerror); -void qerror_print(QError *qerror); void qerror_report_internal(const char *file, int linenr, const char *func, const char *fmt, ...) GCC_FMT_ATTR(4, 5); void qerror_report_err(Error *err); @@ -45,7 +41,6 @@ void assert_no_error(Error *err); QString *qerror_format(const char *fmt, QDict *error); #define qerror_report(fmt, ...) \ qerror_report_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__) -QError *qobject_to_qerror(const QObject *obj); /* * QError class list