git://git.jankratochvil.net
/
gnokii.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[gnokii.git]
/
common
/
files
/
cfgreader.c
diff --git
a/common/files/cfgreader.c
b/common/files/cfgreader.c
index
fc087f6
..
dd0e575
100644
(file)
--- a/
common/files/cfgreader.c
+++ b/
common/files/cfgreader.c
@@
-48,7
+48,7
@@
struct CFG_Header *CFG_ReadFile(char *filename)
/* Open file */
if ((handle = fopen(filename, "r")) == NULL) {
#ifdef DEBUG
/* Open file */
if ((handle = fopen(filename, "r")) == NULL) {
#ifdef DEBUG
- fprintf( stderr, "CFG_ReadFile - open %s: %s\n", filename, strerror(errno));
+
//
fprintf( stderr, "CFG_ReadFile - open %s: %s\n", filename, strerror(errno));
#endif /* DEBUG */
return NULL;
}
#endif /* DEBUG */
return NULL;
}
@@
-104,7
+104,7
@@
struct CFG_Header *CFG_ReadFile(char *filename)
cfg_info = heading;
#ifdef DEBUG
cfg_info = heading;
#ifdef DEBUG
- fprintf(stderr, "Added new section %s\n", heading->section);
+
//
fprintf(stderr, "Added new section %s\n", heading->section);
#endif
/* Go on to next line */
#endif
/* Go on to next line */
@@
-153,7
+153,7
@@
struct CFG_Header *CFG_ReadFile(char *filename)
cfg_info->entries = entry;
#ifdef DEBUG
cfg_info->entries = entry;
#ifdef DEBUG
- fprintf(stderr, "Adding key/value %s/%s\n", entry->key, entry->value);
+
//
fprintf(stderr, "Adding key/value %s/%s\n", entry->key, entry->value);
#endif
/* Go on to next line */
continue;
#endif
/* Go on to next line */
continue;
@@
-254,7
+254,7
@@
struct CFG_Header *CFG_FindGnokiirc()
#else
homedir = getenv("HOME");
if (homedir) strncpy(rcfile, homedir, 200);
#else
homedir = getenv("HOME");
if (homedir) strncpy(rcfile, homedir, 200);
- strncat(rcfile, "/.
my
gnokiirc", 200);
+ strncat(rcfile, "/.gnokiirc", 200);
#endif
/* Try opening .gnokirc from users home directory first */
#endif
/* Try opening .gnokirc from users home directory first */
@@
-265,7
+265,7
@@
struct CFG_Header *CFG_FindGnokiirc()
if ((cfg_info = CFG_ReadFile("/etc/gnokiirc")) == NULL) {
/* That failed too so exit */
#ifdef DEBUG
if ((cfg_info = CFG_ReadFile("/etc/gnokiirc")) == NULL) {
/* That failed too so exit */
#ifdef DEBUG
- fprintf(stderr, _("Couldn't open %s or /etc/gnokiirc. Using defaults...\n"), rcfile);
+
//
fprintf(stderr, _("Couldn't open %s or /etc/gnokiirc. Using defaults...\n"), rcfile);
#endif /* DEBUG */
return NULL;
}
#endif /* DEBUG */
return NULL;
}
@@
-276,7
+276,7
@@
struct CFG_Header *CFG_FindGnokiirc()
if ((cfg_info = CFG_ReadFile("gnokiirc")) == NULL) {
/* That failed too so exit */
#ifdef DEBUG
if ((cfg_info = CFG_ReadFile("gnokiirc")) == NULL) {
/* That failed too so exit */
#ifdef DEBUG
- fprintf(stderr, _("Couldn't open %s or gnokiirc. Using defaults...\n"), rcfile);
+
//
fprintf(stderr, _("Couldn't open %s or gnokiirc. Using defaults...\n"), rcfile);
#endif /* DEBUG */
return NULL;
}
#endif /* DEBUG */
return NULL;
}