renamed warning() to notice()
This commit is contained in:
parent
11062cfff2
commit
9448bd3b7e
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@ vimdir_test_file.vimdir
|
|||||||
vimdir
|
vimdir
|
||||||
object/*
|
object/*
|
||||||
vimdir.tar
|
vimdir.tar
|
||||||
|
*.out
|
||||||
|
@ -11,11 +11,11 @@ void verror(const char * fmt, va_list argv) {
|
|||||||
fdictate(stderr, "$0");
|
fdictate(stderr, "$0");
|
||||||
}
|
}
|
||||||
|
|
||||||
void warning(const char * fmt, ...) {
|
void notice(const char * fmt, ...) {
|
||||||
va_list argv;
|
va_list argv;
|
||||||
va_start(argv, fmt);
|
va_start(argv, fmt);
|
||||||
|
|
||||||
fdictatef(stderr, "$yvimdir: warning: ");
|
fdictatef(stderr, "$yvimdir: notice: ");
|
||||||
vafdictatef(stderr, fmt, argv);
|
vafdictatef(stderr, fmt, argv);
|
||||||
fdictate(stderr, "$0");
|
fdictate(stderr, "$0");
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ enum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
extern void errorn(int n, ...);
|
extern void errorn(int n, ...);
|
||||||
extern void warning(const char * fmt, ...);
|
extern void notice(const char * fmt, ...);
|
||||||
|
|
||||||
#define CHECK_OPEN(f, n, E) \
|
#define CHECK_OPEN(f, n, E) \
|
||||||
if (!f) { \
|
if (!f) { \
|
||||||
|
@ -149,44 +149,44 @@ mode_t str_to_mode(const char *permissions) {
|
|||||||
// --- Dry implementations
|
// --- Dry implementations
|
||||||
static
|
static
|
||||||
int dry_touch(const char * filename) {
|
int dry_touch(const char * filename) {
|
||||||
warning("touch '%s' (subsequent stats will fail)", filename);
|
notice("touch '%s' (subsequent stats will fail)", filename);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
int dry_delete(const char * filename) {
|
int dry_delete(const char * filename) {
|
||||||
warning("delete '%s'", filename);
|
notice("delete '%s'", filename);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
int dry_chmod(const char * filename, mode_t mode) {
|
int dry_chmod(const char * filename, mode_t mode) {
|
||||||
char buf[11];
|
char buf[11];
|
||||||
warning("chmod '%s' (%s)", filename, mode_to_str(mode, buf));
|
notice("chmod '%s' (%s)", filename, mode_to_str(mode, buf));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
int dry_chown(const char * filename, const char * owner, const char * group) {
|
int dry_chown(const char * filename, const char * owner, const char * group) {
|
||||||
warning("chown '%s' (%s:%s)", filename, owner, group);
|
notice("chown '%s' (%s:%s)", filename, owner, group);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
int dry_move(const char * filename, const char * newname) {
|
int dry_move(const char * filename, const char * newname) {
|
||||||
warning("rename '%s' (-> '%s')", filename, newname);
|
notice("rename '%s' (-> '%s')", filename, newname);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
int dry_copy(const char * filename, const char * newname) {
|
int dry_copy(const char * filename, const char * newname) {
|
||||||
warning("copy '%s' (as '%s')", filename, newname);
|
notice("copy '%s' (as '%s')", filename, newname);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
move_data_t dry_mytempmove(const char * filename, const char * newname) {
|
move_data_t dry_mytempmove(const char * filename, const char * newname) {
|
||||||
warning("swap detected in a dry-run ('%s' <-> '%s'); the following logs will be inaccurate", filename, newname);
|
notice("swap detected in a dry-run ('%s' <-> '%s'); the following logs will be inaccurate", filename, newname);
|
||||||
return (move_data_t) {
|
return (move_data_t) {
|
||||||
.orig_name = strdup(filename),
|
.orig_name = strdup(filename),
|
||||||
.curt_name = strdup(filename),
|
.curt_name = strdup(filename),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user