Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liblongpath-rsync
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liblongpath
liblongpath-rsync
Commits
a6c6f8e6
Commit
a6c6f8e6
authored
Nov 22, 2007
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use FLOG instead of FERROR for config errors.
parent
ee6e80c7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
18 deletions
+18
-18
loadparm.c
loadparm.c
+5
-5
params.c
params.c
+13
-13
No files found.
loadparm.c
View file @
a6c6f8e6
...
...
@@ -558,7 +558,7 @@ static int map_parameter(char *parmname)
if
(
strwicmp
(
parm_table
[
iIndex
].
label
,
parmname
)
==
0
)
return
(
iIndex
);
rprintf
(
F
ERROR
,
"Unknown Parameter encountered:
\"
%s
\"\n
"
,
parmname
);
rprintf
(
F
LOG
,
"Unknown Parameter encountered:
\"
%s
\"\n
"
,
parmname
);
return
(
-
1
);
}
...
...
@@ -584,7 +584,7 @@ static BOOL set_boolean(BOOL *pb, char *parmvalue)
*
pb
=
False
;
else
{
rprintf
(
F
ERROR
,
"Badly formed boolean in configuration file:
\"
%s
\"
.
\n
"
,
rprintf
(
F
LOG
,
"Badly formed boolean in configuration file:
\"
%s
\"
.
\n
"
,
parmvalue
);
bRetval
=
False
;
}
...
...
@@ -671,7 +671,7 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue)
if
(
parmnum
<
0
)
{
rprintf
(
F
ERROR
,
"IGNORING unknown parameter
\"
%s
\"\n
"
,
parmname
);
rprintf
(
F
LOG
,
"IGNORING unknown parameter
\"
%s
\"\n
"
,
parmname
);
return
(
True
);
}
...
...
@@ -682,7 +682,7 @@ static BOOL lp_do_parameter(int snum, char *parmname, char *parmvalue)
parm_ptr
=
def_ptr
;
}
else
{
if
(
parm_table
[
parmnum
].
class
==
P_GLOBAL
)
{
rprintf
(
F
ERROR
,
"Global parameter %s found in service section!
\n
"
,
parmname
);
rprintf
(
F
LOG
,
"Global parameter %s found in service section!
\n
"
,
parmname
);
return
(
True
);
}
parm_ptr
=
((
char
*
)
pSERVICE
(
snum
))
+
PTR_DIFF
(
def_ptr
,
&
sDefault
);
...
...
@@ -794,7 +794,7 @@ static BOOL do_section(char *sectionname)
if
((
iServiceIndex
=
add_a_service
(
&
sDefault
,
sectionname
))
<
0
)
{
rprintf
(
F
ERROR
,
"Failed to add a new service
\n
"
);
rprintf
(
F
LOG
,
"Failed to add a new service
\n
"
);
return
(
False
);
}
}
...
...
params.c
View file @
a6c6f8e6
...
...
@@ -211,7 +211,7 @@ static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
bufr
=
realloc_array
(
bufr
,
char
,
bSize
);
if
(
NULL
==
bufr
)
{
rprintf
(
F
ERROR
,
"%s Memory re-allocation failure."
,
func
);
rprintf
(
F
LOG
,
"%s Memory re-allocation failure."
,
func
);
return
(
False
);
}
}
...
...
@@ -223,7 +223,7 @@ static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
bufr
[
end
]
=
'\0'
;
if
(
0
==
end
)
/* Don't allow an empty name. */
{
rprintf
(
F
ERROR
,
"%s Empty section name in configuration file.
\n
"
,
func
);
rprintf
(
F
LOG
,
"%s Empty section name in configuration file.
\n
"
,
func
);
return
(
False
);
}
if
(
!
sfunc
(
bufr
)
)
/* Got a valid name. Deal with it. */
...
...
@@ -236,7 +236,7 @@ static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
if
(
i
<
0
)
{
bufr
[
end
]
=
'\0'
;
rprintf
(
F
ERROR
,
"%s Badly formed line in configuration file: %s
\n
"
,
rprintf
(
F
LOG
,
"%s Badly formed line in configuration file: %s
\n
"
,
func
,
bufr
);
return
(
False
);
}
...
...
@@ -261,7 +261,7 @@ static BOOL Section( FILE *InFile, BOOL (*sfunc)(char *) )
}
/* We arrive here if we've met the EOF before the closing bracket. */
rprintf
(
F
ERROR
,
"%s Unexpected EOF in the configuration file: %s
\n
"
,
func
,
bufr
);
rprintf
(
F
LOG
,
"%s Unexpected EOF in the configuration file: %s
\n
"
,
func
,
bufr
);
return
(
False
);
}
/* Section */
...
...
@@ -305,7 +305,7 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
bufr
=
realloc_array
(
bufr
,
char
,
bSize
);
if
(
NULL
==
bufr
)
{
rprintf
(
F
ERROR
,
"%s Memory re-allocation failure."
,
func
)
;
rprintf
(
F
LOG
,
"%s Memory re-allocation failure."
,
func
)
;
return
(
False
);
}
}
...
...
@@ -315,7 +315,7 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
case
'='
:
/* Equal sign marks end of param name. */
if
(
0
==
end
)
/* Don't allow an empty name. */
{
rprintf
(
F
ERROR
,
"%s Invalid parameter name in config. file.
\n
"
,
func
);
rprintf
(
F
LOG
,
"%s Invalid parameter name in config. file.
\n
"
,
func
);
return
(
False
);
}
bufr
[
end
++
]
=
'\0'
;
/* Mark end of string & advance. */
...
...
@@ -329,7 +329,7 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
if
(
i
<
0
)
{
bufr
[
end
]
=
'\0'
;
rprintf
(
F
ERROR
,
"%s Ignoring badly formed line in configuration file: %s
\n
"
,
rprintf
(
F
LOG
,
"%s Ignoring badly formed line in configuration file: %s
\n
"
,
func
,
bufr
);
return
(
True
);
}
...
...
@@ -340,7 +340,7 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
case
'\0'
:
/* Shouldn't have EOF within param name. */
case
EOF
:
bufr
[
i
]
=
'\0'
;
rprintf
(
F
ERROR
,
"%s Unexpected end-of-file at: %s
\n
"
,
func
,
bufr
);
rprintf
(
F
LOG
,
"%s Unexpected end-of-file at: %s
\n
"
,
func
,
bufr
);
return
(
True
);
default
:
...
...
@@ -370,7 +370,7 @@ static BOOL Parameter( FILE *InFile, BOOL (*pfunc)(char *, char *), int c )
bufr
=
realloc_array
(
bufr
,
char
,
bSize
);
if
(
NULL
==
bufr
)
{
rprintf
(
F
ERROR
,
"%s Memory re-allocation failure."
,
func
)
;
rprintf
(
F
LOG
,
"%s Memory re-allocation failure."
,
func
)
;
return
(
False
);
}
}
...
...
@@ -485,14 +485,14 @@ static FILE *OpenConfFile( char *FileName )
if
(
NULL
==
FileName
||
0
==
*
FileName
)
{
rprintf
(
F
ERROR
,
"%s No configuration filename specified.
\n
"
,
func
);
rprintf
(
F
LOG
,
"%s No configuration filename specified.
\n
"
,
func
);
return
(
NULL
);
}
OpenedFile
=
fopen
(
FileName
,
"r"
);
if
(
NULL
==
OpenedFile
)
{
rsyserr
(
F
ERROR
,
errno
,
"unable to open configuration file
\"
%s
\"
"
,
rsyserr
(
F
LOG
,
errno
,
"unable to open configuration file
\"
%s
\"
"
,
FileName
);
}
...
...
@@ -534,7 +534,7 @@ BOOL pm_process( char *FileName,
bufr
=
new_array
(
char
,
bSize
);
if
(
NULL
==
bufr
)
{
rprintf
(
F
ERROR
,
"%s memory allocation failure.
\n
"
,
func
);
rprintf
(
F
LOG
,
"%s memory allocation failure.
\n
"
,
func
);
fclose
(
InFile
);
return
(
False
);
}
...
...
@@ -548,7 +548,7 @@ BOOL pm_process( char *FileName,
if
(
!
result
)
/* Generic failure. */
{
rprintf
(
F
ERROR
,
"%s Failed. Error returned from params.c:parse().
\n
"
,
func
);
rprintf
(
F
LOG
,
"%s Failed. Error returned from params.c:parse().
\n
"
,
func
);
return
(
False
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment