Check-in [b9a32192b7]
Overview
Comment:Added missing error line/file information for conf_apache libconfig 0.1.20
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | 0.1.20
Files: files | file ages | folders
SHA1: b9a32192b7961a160a4a83ac5fb09fe000425d8e
User & Date: rkeene on 2005-10-18 16:00:27
Other Links: manifest | tags
Context
2005-10-18
16:03
Fixed compile error caused by Subversion update confusion. libconfig 0.1.21 check-in: 45472c6a14 user: rkeene tags: trunk, 0.1.21
16:00
Added missing error line/file information for conf_apache libconfig 0.1.20 check-in: b9a32192b7 user: rkeene tags: trunk, 0.1.20
2005-09-30
08:27
Added filename and line numbers to error messages. Began adding support for lists of options rather than just one option per item. libconfig 0.1.19 check-in: 730308bffd user: rkeene tags: trunk, 0.1.19
Changes

Modified conf_apache.c from [dfc17c3008] to [910273dff3].

    89     89   	char *cmd = NULL, *value = NULL, *sep = NULL, *cmdend = NULL;
    90     90   	char *fgetsret = NULL;
    91     91   	int lcpvret = -1, lpcafret = -1;
    92     92   	int invalid_section = 0, ignore_section = 0;
    93     93   	int local_lc_errline;
    94     94   	int retval = 0;
    95     95   	lc_err_t save_lc_errno = LC_ERR_NONE;
           96  +	char *local_lc_errfile;
           97  +	int local_lc_errline;
    96     98   
    97     99   	if (pathprefix != NULL) {
    98    100   		/* Copy the prefix, if specified. */
    99    101   		strncpy(qualifbuf, pathprefix, sizeof(qualifbuf) - 1);
   100    102   	}
   101    103   
   102    104   	local_lc_errfile = configfile;
................................................................................
   334    336   		lc_errno = LC_ERR_NONE;
   335    337   		lcpvret = lc_process_var(qualifbuf, NULL, value, LC_FLAGS_VAR);
   336    338   		if (lcpvret < 0) {
   337    339   			if (lc_errno == LC_ERR_NONE) {
   338    340   #ifdef DEBUG
   339    341   				fprintf(stderr, "Invalid command: \"%s\"\n", cmd);
   340    342   #endif
          343  +				lc_errfile = local_lc_errfile;
          344  +				lc_errline = local_lc_errline;
   341    345   				lc_errno = LC_ERR_INVCMD;
   342    346   			} else {
   343    347   #ifdef DEBUG
   344    348   				fprintf(stderr, "Error processing command (command was valid, but an error occured, errno was set)\n");
   345    349   #endif
   346    350   			}
   347    351   			lc_errfile = local_lc_errfile;

Modified configure from [243499a4d9] to [7fc4d03a11].

     1      1   #! /bin/sh
     2      2   # From configure.ac Revision .
     3      3   # Guess values for system-dependent variables and create Makefiles.
     4         -# Generated by GNU Autoconf 2.59 for libconfig 0.1.18.
            4  +# Generated by GNU Autoconf 2.59 for libconfig 0.1.20.
     5      5   #
     6      6   # Copyright (C) 2003 Free Software Foundation, Inc.
     7      7   # This configure script is free software; the Free Software Foundation
     8      8   # gives unlimited permission to copy, distribute and modify it.
     9      9   ## --------------------- ##
    10     10   ## M4sh Initialization.  ##
    11     11   ## --------------------- ##
................................................................................
   264    264   # This variable seems obsolete.  It should probably be removed, and
   265    265   # only ac_max_sed_lines should be used.
   266    266   : ${ac_max_here_lines=38}
   267    267   
   268    268   # Identity of this package.
   269    269   PACKAGE_NAME='libconfig'
   270    270   PACKAGE_TARNAME='libconfig'
   271         -PACKAGE_VERSION='0.1.18'
   272         -PACKAGE_STRING='libconfig 0.1.18'
          271  +PACKAGE_VERSION='0.1.20'
          272  +PACKAGE_STRING='libconfig 0.1.20'
   273    273   PACKAGE_BUGREPORT=''
   274    274   
   275    275   # Factoring default headers for most tests.
   276    276   ac_includes_default="\
   277    277   #include <stdio.h>
   278    278   #if HAVE_SYS_TYPES_H
   279    279   # include <sys/types.h>
................................................................................
   774    774   #
   775    775   # Report the --help message.
   776    776   #
   777    777   if test "$ac_init_help" = "long"; then
   778    778     # Omit some internal or obsolete options to make the list less imposing.
   779    779     # This message is too long to be a string in the A/UX 3.1 sh.
   780    780     cat <<_ACEOF
   781         -\`configure' configures libconfig 0.1.18 to adapt to many kinds of systems.
          781  +\`configure' configures libconfig 0.1.20 to adapt to many kinds of systems.
   782    782   
   783    783   Usage: $0 [OPTION]... [VAR=VALUE]...
   784    784   
   785    785   To assign environment variables (e.g., CC, CFLAGS...), specify them as
   786    786   VAR=VALUE.  See below for descriptions of some of the useful variables.
   787    787   
   788    788   Defaults for the options are specified in brackets.
................................................................................
   835    835     --build=BUILD     configure for building on BUILD [guessed]
   836    836     --host=HOST       cross-compile to build programs to run on HOST [BUILD]
   837    837   _ACEOF
   838    838   fi
   839    839   
   840    840   if test -n "$ac_init_help"; then
   841    841     case $ac_init_help in
   842         -     short | recursive ) echo "Configuration of libconfig 0.1.18:";;
          842  +     short | recursive ) echo "Configuration of libconfig 0.1.20:";;
   843    843      esac
   844    844     cat <<\_ACEOF
   845    845   
   846    846   Optional Features:
   847    847     --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   848    848     --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   849    849     --enable-small          Enable small build of libconfig. (disabled)
................................................................................
   956    956       cd $ac_popdir
   957    957     done
   958    958   fi
   959    959   
   960    960   test -n "$ac_init_help" && exit 0
   961    961   if $ac_init_version; then
   962    962     cat <<\_ACEOF
   963         -libconfig configure 0.1.18
          963  +libconfig configure 0.1.20
   964    964   generated by GNU Autoconf 2.59
   965    965   
   966    966   Copyright (C) 2003 Free Software Foundation, Inc.
   967    967   This configure script is free software; the Free Software Foundation
   968    968   gives unlimited permission to copy, distribute and modify it.
   969    969   _ACEOF
   970    970     exit 0
   971    971   fi
   972    972   exec 5>config.log
   973    973   cat >&5 <<_ACEOF
   974    974   This file contains any messages produced by compilers while
   975    975   running configure, to aid debugging if configure makes a mistake.
   976    976   
   977         -It was created by libconfig $as_me 0.1.18, which was
          977  +It was created by libconfig $as_me 0.1.20, which was
   978    978   generated by GNU Autoconf 2.59.  Invocation command line was
   979    979   
   980    980     $ $0 $@
   981    981   
   982    982   _ACEOF
   983    983   {
   984    984   cat <<_ASUNAME
................................................................................
 17447  17447     echo
 17448  17448     sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 17449  17449   ## Running $as_me. ##
 17450  17450   _ASBOX
 17451  17451   } >&5
 17452  17452   cat >&5 <<_CSEOF
 17453  17453   
 17454         -This file was extended by libconfig $as_me 0.1.18, which was
        17454  +This file was extended by libconfig $as_me 0.1.20, which was
 17455  17455   generated by GNU Autoconf 2.59.  Invocation command line was
 17456  17456   
 17457  17457     CONFIG_FILES    = $CONFIG_FILES
 17458  17458     CONFIG_HEADERS  = $CONFIG_HEADERS
 17459  17459     CONFIG_LINKS    = $CONFIG_LINKS
 17460  17460     CONFIG_COMMANDS = $CONFIG_COMMANDS
 17461  17461     $ $0 $@
................................................................................
 17507  17507   $config_headers
 17508  17508   
 17509  17509   Report bugs to <bug-autoconf@gnu.org>."
 17510  17510   _ACEOF
 17511  17511   
 17512  17512   cat >>$CONFIG_STATUS <<_ACEOF
 17513  17513   ac_cs_version="\\
 17514         -libconfig config.status 0.1.18
        17514  +libconfig config.status 0.1.20
 17515  17515   configured by $0, generated by GNU Autoconf 2.59,
 17516  17516     with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 17517  17517   
 17518  17518   Copyright (C) 2003 Free Software Foundation, Inc.
 17519  17519   This config.status script is free software; the Free Software Foundation
 17520  17520   gives unlimited permission to copy, distribute and modify it."
 17521  17521   srcdir=$srcdir

Modified configure.ac from [e806c2cabd] to [c4cd959720].

     1      1   AC_REVISION($Revision $)
     2         -AC_INIT(libconfig, 0.1.19)
            2  +AC_INIT(libconfig, 0.1.20)
     3      3   AC_CONFIG_HEADER(config.h)
     4      4   
     5      5   dnl Find out about the host OS
     6      6   DC_CHK_OS_INFO
     7      7   
     8      8   dnl Checks for programs.
     9      9   AC_PROG_CC