shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

libdm: use literal for error message

Browse Source 
Use literals for printf messages.
This commit is contained in:
Zdenek Kabelac 2024-05-04 11:30:50 +02:00
parent 75a03c2c26
commit a763420786
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
device_mapper/libdm-report.c
View File

@ -2890,7 +2890,6 @@ typedef enum {
static char *_get_date(char *str, struct tm *tm, time_range_t *range) static char *_get_date(char *str, struct tm *tm, time_range_t *range)
{ {
static const char incorrect_date_format_msg[] = "Incorrect date format.";
time_range_t tmp_range = RANGE_NONE; time_range_t tmp_range = RANGE_NONE;
long n1, n2 = -1, n3 = -1; long n1, n2 = -1, n3 = -1;
char *s = str, *end; char *s = str, *end;
@ -2936,19 +2935,15 @@ static char *_get_date(char *str, struct tm *tm, time_range_t *range)
n3 = n1 % 100; n3 = n1 % 100;
n2 = (n1 / 100) % 100; n2 = (n1 / 100) % 100;
n1 = n1 / 10000; n1 = n1 / 10000;
} else { } else
log_error(incorrect_date_format_msg); goto_bad;
return NULL;
}
} else { } else {
if (len == 7) { if (len == 7) {
tmp_range = RANGE_MONTH; tmp_range = RANGE_MONTH;
/* YYYY-MM */ /* YYYY-MM */
n3 = 1; n3 = 1;
} else { } else
log_error(incorrect_date_format_msg); goto_bad;
return NULL;
}
} }
} }
@ -2971,11 +2966,15 @@ static char *_get_date(char *str, struct tm *tm, time_range_t *range)
*range = tmp_range; *range = tmp_range;
return (char *) _skip_space(end); return (char *) _skip_space(end);
bad:
log_error("Incorrect date format.");
return NULL;
} }
static char *_get_time(char *str, struct tm *tm, time_range_t *range) static char *_get_time(char *str, struct tm *tm, time_range_t *range)
{ {
static const char incorrect_time_format_msg[] = "Incorrect time format.";
time_range_t tmp_range = RANGE_NONE; time_range_t tmp_range = RANGE_NONE;
long n1, n2 = -1, n3 = -1; long n1, n2 = -1, n3 = -1;
char *s = str, *end; char *s = str, *end;
@ -3023,19 +3022,15 @@ static char *_get_time(char *str, struct tm *tm, time_range_t *range)
n3 = n1 % 100; n3 = n1 % 100;
n2 = (n1 / 100) % 100; n2 = (n1 / 100) % 100;
n1 = n1 / 10000; n1 = n1 / 10000;
} else { } else
log_error(incorrect_time_format_msg); goto_bad;
return NULL;
}
} else { } else {
if (len == 5) { if (len == 5) {
/* HH:MM */ /* HH:MM */
tmp_range = RANGE_MINUTE; tmp_range = RANGE_MINUTE;
n3 = 0; n3 = 0;
} else { } else
log_error(incorrect_time_format_msg); goto_bad;
return NULL;
}
} }
} }
@ -3066,6 +3061,11 @@ static char *_get_time(char *str, struct tm *tm, time_range_t *range)
*range = tmp_range; *range = tmp_range;
return (char *) _skip_space(end); return (char *) _skip_space(end);
bad:
log_error("Incorrect time format.");
return NULL;
} }
/* The offset is always an absolute offset against GMT! */ /* The offset is always an absolute offset against GMT! */

36
libdm/libdm-report.c
View File

@ -2888,7 +2888,6 @@ typedef enum {
static char *_get_date(char *str, struct tm *tm, time_range_t *range) static char *_get_date(char *str, struct tm *tm, time_range_t *range)
{ {
static const char incorrect_date_format_msg[] = "Incorrect date format.";
time_range_t tmp_range = RANGE_NONE; time_range_t tmp_range = RANGE_NONE;
long n1, n2 = -1, n3 = -1; long n1, n2 = -1, n3 = -1;
char *s = str, *end; char *s = str, *end;
@ -2934,19 +2933,15 @@ static char *_get_date(char *str, struct tm *tm, time_range_t *range)
n3 = n1 % 100; n3 = n1 % 100;
n2 = (n1 / 100) % 100; n2 = (n1 / 100) % 100;
n1 = n1 / 10000; n1 = n1 / 10000;
} else { } else
log_error(incorrect_date_format_msg); goto_bad;
return NULL;
}
} else { } else {
if (len == 7) { if (len == 7) {
tmp_range = RANGE_MONTH; tmp_range = RANGE_MONTH;
/* YYYY-MM */ /* YYYY-MM */
n3 = 1; n3 = 1;
} else { } else
log_error(incorrect_date_format_msg); goto_bad;
return NULL;
}
} }
} }
@ -2969,11 +2964,15 @@ static char *_get_date(char *str, struct tm *tm, time_range_t *range)
*range = tmp_range; *range = tmp_range;
return (char *) _skip_space(end); return (char *) _skip_space(end);
bad:
log_error("Incorrect date format.");
return NULL;
} }
static char *_get_time(char *str, struct tm *tm, time_range_t *range) static char *_get_time(char *str, struct tm *tm, time_range_t *range)
{ {
static const char incorrect_time_format_msg[] = "Incorrect time format.";
time_range_t tmp_range = RANGE_NONE; time_range_t tmp_range = RANGE_NONE;
long n1, n2 = -1, n3 = -1; long n1, n2 = -1, n3 = -1;
char *s = str, *end; char *s = str, *end;
@ -3021,19 +3020,15 @@ static char *_get_time(char *str, struct tm *tm, time_range_t *range)
n3 = n1 % 100; n3 = n1 % 100;
n2 = (n1 / 100) % 100; n2 = (n1 / 100) % 100;
n1 = n1 / 10000; n1 = n1 / 10000;
} else { } else
log_error(incorrect_time_format_msg); goto_bad;
return NULL;
}
} else { } else {
if (len == 5) { if (len == 5) {
/* HH:MM */ /* HH:MM */
tmp_range = RANGE_MINUTE; tmp_range = RANGE_MINUTE;
n3 = 0; n3 = 0;
} else { } else
log_error(incorrect_time_format_msg); goto_bad;
return NULL;
}
} }
} }
@ -3064,6 +3059,11 @@ static char *_get_time(char *str, struct tm *tm, time_range_t *range)
*range = tmp_range; *range = tmp_range;
return (char *) _skip_space(end); return (char *) _skip_space(end);
bad:
log_error("Incorrect time format.");
return NULL;
} }
/* The offset is always an absolute offset against GMT! */ /* The offset is always an absolute offset against GMT! */