ERROR fix error string creation
At some points in the code the error string includes itself. This generates self-repeating error messages.
This commit is contained in:
@@ -243,13 +243,15 @@ void
|
|||||||
iscsi_set_error(struct iscsi_context *iscsi, const char *error_string, ...)
|
iscsi_set_error(struct iscsi_context *iscsi, const char *error_string, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
char errstr[MAX_STRING_SIZE+1] = {0};
|
||||||
|
|
||||||
va_start(ap, error_string);
|
va_start(ap, error_string);
|
||||||
if (vsnprintf(iscsi->error_string, MAX_STRING_SIZE, error_string, ap) < 0) {
|
if (vsnprintf(errstr, MAX_STRING_SIZE, error_string, ap) < 0) {
|
||||||
strncpy(iscsi->error_string,"could not format error string!",MAX_STRING_SIZE);
|
strncpy(errstr,"could not format error string!",MAX_STRING_SIZE);
|
||||||
}
|
}
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
|
|
||||||
|
strncpy(iscsi->error_string,errstr,MAX_STRING_SIZE);
|
||||||
DPRINTF(iscsi,1,"%s",iscsi->error_string);
|
DPRINTF(iscsi,1,"%s",iscsi->error_string);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user