Changeset 673a54c for conf.c

Timestamp:

2009-03-12T19:33:28Z (16 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

fc34fb5

Parents:

823de9d (diff), 9e768da (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

pretty blind try at merging in the latest trunk

File:

• conf.c (modified) (3 diffs)

conf.c

@@ -79 +79 @@
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hu:" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
@@ -314 +314 @@
                         else
                         {
-                                fprintf( stderr, "Error: Unknown setting `%s` in configuration file.\n", ini->key );
+                                fprintf( stderr, "Error: Unknown setting `%s` in configuration file (line %d).\n", ini->key, ini->line );
                                 return 0;
                                 /* For now just ignore unknown keys... */
@@ -321 +321 @@
                 else if( g_strcasecmp( ini->section, "defaults" ) != 0 )
                 {
-                        fprintf( stderr, "Error: Unknown section [%s] in configuration file. "
-                                         "BitlBee configuration must be put in a [settings] section!\n", ini->section );
+                        fprintf( stderr, "Error: Unknown section [%s] in configuration file (line %d). "
+                                         "BitlBee configuration must be put in a [settings] section!\n", ini->section, ini->line );
                         return 0;
                 }