diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-03-18 04:01:37 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2006-03-18 04:01:37 +0000 |
| commit | 0e793b510a2a61759cccf4caa38d9651eae1018b (patch) | |
| tree | fd23fef78584a66ca6852895ecbd827ab8de68ab /src/conf.c | |
| parent | 17d3ccbaa3f22c4c0f8a86515d71fc017a451bbd (diff) | |
| download | mpd-svn/oggflac.tar.gz mpd-svn/oggflac.tar.xz mpd-svn/oggflac.zip | |
merge up to r3928, branch should be closeable unless there aresvn/oggflac
major issues that need to be addressed.
git-svn-id: https://svn.musicpd.org/mpd/branches/oggflac@3929 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
| -rw-r--r-- | src/conf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conf.c b/src/conf.c index 0fd3dda95..756fef9f9 100644 --- a/src/conf.c +++ b/src/conf.c @@ -215,7 +215,7 @@ static ConfigParam * readConfigBlock(FILE * fp, int * count, char * string) { { ERROR("improperly formatted config file at line %i:" " %s\n", count, string); - ERROR("in block begging at line %i\n", ret->line); + ERROR("in block begining at line %i\n", ret->line); exit(EXIT_FAILURE); } @@ -268,7 +268,7 @@ void readConf(char * file) { } if(!findInList(configEntriesList, array[0], &voidPtr)) { - ERROR("unrecognized paramater in config file at line " + ERROR("unrecognized parameter in config file at line " "%i: %s\n", count, string); exit(EXIT_FAILURE); } @@ -279,7 +279,7 @@ void readConf(char * file) { entry->configParamList->numberOfNodes) { param = entry->configParamList->firstNode->data; - ERROR("config paramter \"%s\" is first defined on line " + ERROR("config parameter \"%s\" is first defined on line " "%i and redefined on line %i\n", array[0], param->line, count); exit(EXIT_FAILURE); @@ -416,7 +416,7 @@ ConfigParam * parseConfigFilePath(char * name, int force) { for(;*ch!='\0' && *ch!='/';ch++); if(*ch=='/') foundSlash = 1; * ch = '\0'; - pos+= ch-path+1; + pos+= ch-path-1; if((pwd = getpwnam(path+1)) == NULL) { ERROR("user \"%s\" not found at line %i\n", path+1, param->line); |