wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-06 15:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include the configuration file name when reporting parse errors.

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5649 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2009-02-15 17:26:57 +00:00
1 parent 6a7286464d
commit 0efe346b80
9 files changed
+65 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/error.c
+22 -1
View File
@@ -1,7 +1,7 @@
/*
error.c - Part of libsensors, a Linux library for reading sensor data.
Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>
Copyright (C) 2007, 2008 Jean Delvare <khali@linux-fr.org>
Copyright (C) 2007-2009 Jean Delvare <khali@linux-fr.org>
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
@@ -25,10 +25,14 @@
#include "general.h"
static void sensors_default_parse_error(const char *err, int lineno);
static void sensors_default_parse_error_wfn(const char *err,
const char *filename, int lineno);
static void sensors_default_fatal_error(const char *proc, const char *err);
void (*sensors_parse_error) (const char *err, int lineno) =
sensors_default_parse_error;
void (*sensors_parse_error_wfn) (const char *err, const char *filename,
int lineno) = sensors_default_parse_error_wfn;
void (*sensors_fatal_error) (const char *proc, const char *err) =
sensors_default_fatal_error;
@@ -64,6 +68,23 @@ void sensors_default_parse_error(const char *err, int lineno)
fprintf(stderr, "Error: %s\n", err);
}
void sensors_default_parse_error_wfn(const char *err,
const char *filename, int lineno)
{
/* If application provided a custom parse error reporting function
but not the variant with the filename, fall back to the original
variant without the filename, for backwards compatibility. */
if (sensors_parse_error != sensors_default_parse_error ||
!filename)
return sensors_parse_error(err, lineno);
if (lineno)
fprintf(stderr, "Error: File %s, line %d: %s\n", filename,
lineno, err);
else
fprintf(stderr, "Error: File %s: %s\n", filename, err);
}
void sensors_default_fatal_error(const char *proc, const char *err)
{
fprintf(stderr, "Fatal error in `%s': %s\n", proc, err);