Add a routine to report rename failures.
That routine is similar to the other report_message.c rouines, in that it calls a UI routine through a pointer. Ad a command-line "report a rename error" routine, to match the GUI one.
This commit is contained in:
parent
ccea80520a
commit
10923f6432
@ -1491,6 +1491,7 @@ main(int argc, char *argv[])
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
@ -85,6 +85,7 @@ main(int argc, char *argv[])
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
1
dftest.c
1
dftest.c
@ -411,6 +411,7 @@ main(int argc, char **argv)
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
@ -1307,6 +1307,7 @@ main(int argc, char *argv[])
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
@ -2508,6 +2508,7 @@ int main(int argc, char *argv[]) {
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
@ -161,6 +161,7 @@ fuzz_init(int argc _U_, char **argv)
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
@ -210,6 +210,7 @@ main(int argc, char *argv[])
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
@ -130,6 +130,7 @@ main(int argc, char *argv[])
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
@ -437,6 +437,7 @@ main(int argc, char *argv[])
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
@ -167,6 +167,7 @@ main(int argc, char *argv[])
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
1
sharkd.c
1
sharkd.c
@ -109,6 +109,7 @@ main(int argc, char *argv[])
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
@ -1059,6 +1059,7 @@ main(int argc, char *argv[])
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
@ -314,6 +314,7 @@ main(int argc, char *argv[])
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
1
tshark.c
1
tshark.c
@ -1055,6 +1055,7 @@ main(int argc, char *argv[])
|
|||||||
open_failure_message,
|
open_failure_message,
|
||||||
read_failure_message,
|
read_failure_message,
|
||||||
write_failure_message,
|
write_failure_message,
|
||||||
|
rename_failure_message,
|
||||||
cfile_open_failure_message,
|
cfile_open_failure_message,
|
||||||
cfile_dump_open_failure_message,
|
cfile_dump_open_failure_message,
|
||||||
cfile_read_failure_message,
|
cfile_read_failure_message,
|
||||||
|
@ -69,6 +69,21 @@ write_failure_message(const char *filename, int err)
|
|||||||
filename, g_strerror(err));
|
filename, g_strerror(err));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Error message for a failed attempt to rename a file other than
|
||||||
|
* a capture file.
|
||||||
|
* "old_filename" is the name of the file being renamed; "new_filename"
|
||||||
|
* is the name to which it's being renamed; "err" is assumed to be a
|
||||||
|
* UNIX-style errno.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
rename_failure_message(const char *old_filename, const char *new_filename,
|
||||||
|
int err)
|
||||||
|
{
|
||||||
|
cmdarg_err("An error occurred while renaming the file \"%s\" to \"%s\": %s.",
|
||||||
|
old_filename, new_filename, g_strerror(err));
|
||||||
|
}
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
input_file_description(const char *fname)
|
input_file_description(const char *fname)
|
||||||
{
|
{
|
||||||
|
@ -48,6 +48,16 @@ extern void read_failure_message(const char *filename, int err);
|
|||||||
*/
|
*/
|
||||||
extern void write_failure_message(const char *filename, int err);
|
extern void write_failure_message(const char *filename, int err);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Error message for a failed attempt to rename a file other than
|
||||||
|
* a capture file.
|
||||||
|
* "old_filename" is the name of the file being renamed; "new_filename"
|
||||||
|
* is the name to which it's being renamed; "err" is assumed to be a
|
||||||
|
* UNIX-style errno.
|
||||||
|
*/
|
||||||
|
extern void rename_failure_message(const char *old_filename,
|
||||||
|
const char *new_filename, int err);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Error message for a failed attempt to open a capture file for input.
|
* Error message for a failed attempt to open a capture file for input.
|
||||||
* "filename" is the name of the file being opened; "err" is assumed
|
* "filename" is the name of the file being opened; "err" is assumed
|
||||||
|
@ -457,6 +457,7 @@ int main(int argc, char *qt_argv[])
|
|||||||
open_failure_alert_box,
|
open_failure_alert_box,
|
||||||
read_failure_alert_box,
|
read_failure_alert_box,
|
||||||
write_failure_alert_box,
|
write_failure_alert_box,
|
||||||
|
rename_failure_alert_box,
|
||||||
cfile_open_failure_alert_box,
|
cfile_open_failure_alert_box,
|
||||||
cfile_dump_open_failure_alert_box,
|
cfile_dump_open_failure_alert_box,
|
||||||
cfile_read_failure_alert_box,
|
cfile_read_failure_alert_box,
|
||||||
|
@ -506,6 +506,7 @@ int main(int argc, char *qt_argv[])
|
|||||||
open_failure_alert_box,
|
open_failure_alert_box,
|
||||||
read_failure_alert_box,
|
read_failure_alert_box,
|
||||||
write_failure_alert_box,
|
write_failure_alert_box,
|
||||||
|
rename_failure_alert_box,
|
||||||
cfile_open_failure_alert_box,
|
cfile_open_failure_alert_box,
|
||||||
cfile_dump_open_failure_alert_box,
|
cfile_dump_open_failure_alert_box,
|
||||||
cfile_read_failure_alert_box,
|
cfile_read_failure_alert_box,
|
||||||
|
@ -90,6 +90,17 @@ report_write_failure(const char *filename, int err)
|
|||||||
(*routines->report_write_failure)(filename, err);
|
(*routines->report_write_failure)(filename, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Report an error when trying to rename a file.
|
||||||
|
* "err" is assumed to be a UNIX-style errno.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
report_rename_failure(const char *old_filename, const char *new_filename,
|
||||||
|
int err)
|
||||||
|
{
|
||||||
|
(*routines->report_rename_failure)(old_filename, new_filename, err);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Report an error from opening a capture file for reading.
|
* Report an error from opening a capture file for reading.
|
||||||
*/
|
*/
|
||||||
|
@ -35,6 +35,7 @@ struct report_message_routines {
|
|||||||
void (*report_open_failure)(const char *, int, bool);
|
void (*report_open_failure)(const char *, int, bool);
|
||||||
void (*report_read_failure)(const char *, int);
|
void (*report_read_failure)(const char *, int);
|
||||||
void (*report_write_failure)(const char *, int);
|
void (*report_write_failure)(const char *, int);
|
||||||
|
void (*report_rename_failure)(const char *, const char *, int);
|
||||||
void (*report_cfile_open_failure)(const char *, int, char *);
|
void (*report_cfile_open_failure)(const char *, int, char *);
|
||||||
void (*report_cfile_dump_open_failure)(const char *, int, char *, int);
|
void (*report_cfile_dump_open_failure)(const char *, int, char *, int);
|
||||||
void (*report_cfile_read_failure)(const char *, int, char *);
|
void (*report_cfile_read_failure)(const char *, int, char *);
|
||||||
@ -77,6 +78,13 @@ WS_DLL_PUBLIC void report_read_failure(const char *filename, int err);
|
|||||||
*/
|
*/
|
||||||
WS_DLL_PUBLIC void report_write_failure(const char *filename, int err);
|
WS_DLL_PUBLIC void report_write_failure(const char *filename, int err);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Report an error when trying to rename a file.
|
||||||
|
* "err" is assumed to be a UNIX-style errno.
|
||||||
|
*/
|
||||||
|
WS_DLL_PUBLIC void report_rename_failure(const char *old_filename,
|
||||||
|
const char *new_filename, int err);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Report an error from opening a capture file for reading.
|
* Report an error from opening a capture file for reading.
|
||||||
*/
|
*/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user