diff options
| author | Theodore Ts'o <tytso@mit.edu> | 1997-08-10 23:02:21 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 1997-08-10 23:02:21 +0000 |
| commit | a47b66ee09960a8bf00e72b431ec56d68e11a301 (patch) | |
| tree | 4519a6a35880eac5c1b79c684cf815be0f1c43b9 /lib | |
| parent | ab6b8ab64d5afb5393a9aa826fce26490127f785 (diff) | |
| download | e2fsprogs-a47b66ee09960a8bf00e72b431ec56d68e11a301.tar.gz | |
ChangeLog, error_message.c, error_table.h, et_name.c:
error_table.h:
et_name.c (error_table_name):
error_message.c (error_message.c): Make code be 16-bit safe.
ChangeLog, e2fsck.c:
e2fsck.c (check_mount): Add stronger warning message about the perils
of running e2fsck on a mounted filesystem.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/et/ChangeLog | 6 | ||||
| -rw-r--r-- | lib/et/error_message.c | 4 | ||||
| -rw-r--r-- | lib/et/error_table.h | 2 | ||||
| -rw-r--r-- | lib/et/et_name.c | 7 |
4 files changed, 13 insertions, 6 deletions
diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog index 78db182b..b7c9e065 100644 --- a/lib/et/ChangeLog +++ b/lib/et/ChangeLog @@ -1,3 +1,9 @@ +Sun Aug 10 09:40:54 1997 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * error_table.h: + * et_name.c (error_table_name): + * error_message.c (error_message.c): Make code be 16-bit safe. + Tue Jun 17 01:33:20 1997 Theodore Ts'o <tytso@rsts-11.mit.edu> * Release of E2fsprogs 1.11 diff --git a/lib/et/error_message.c b/lib/et/error_message.c index c6c2b397..88ce15b5 100644 --- a/lib/et/error_message.c +++ b/lib/et/error_message.c @@ -31,11 +31,11 @@ const char * error_message (code) { int offset; struct et_list *et; - int table_num; + errcode_t table_num; int started = 0; char *cp; - offset = code & ((1<<ERRCODE_RANGE)-1); + offset = (int) (code & ((1<<ERRCODE_RANGE)-1)); table_num = code - offset; if (!table_num) { #ifdef HAS_SYS_ERRLIST diff --git a/lib/et/error_table.h b/lib/et/error_table.h index 31971f03..ea79e72b 100644 --- a/lib/et/error_table.h +++ b/lib/et/error_table.h @@ -26,7 +26,7 @@ extern struct et_list * _et_list; #define BITS_PER_CHAR 6 /* # bits to shift per character in name */ #ifdef __STDC__ -extern const char *error_table_name(int num); +extern const char *error_table_name(errcode_t num); #else extern const char *error_table_name(); #endif diff --git a/lib/et/et_name.c b/lib/et/et_name.c index db4099fa..cf3cd5c2 100644 --- a/lib/et/et_name.c +++ b/lib/et/et_name.c @@ -4,6 +4,7 @@ * For copyright info, see mit-sipb-copyright.h. */ +#include "com_err.h" #include "error_table.h" #include "mit-sipb-copyright.h" #include "internal.h" @@ -14,7 +15,7 @@ static const char char_set[] = static char buf[6]; const char * error_table_name(num) - int num; + errcode_t num; { int ch; int i; @@ -24,10 +25,10 @@ const char * error_table_name(num) p = buf; num >>= ERRCODE_RANGE; /* num = ?? ??? ??? aaa aaa bbb bbb ccc ccc ddd ddd */ - num &= 077777777; + num &= 077777777L; /* num = 00 000 000 aaa aaa bbb bbb ccc ccc ddd ddd */ for (i = 4; i >= 0; i--) { - ch = (num >> BITS_PER_CHAR * i) & ((1 << BITS_PER_CHAR) - 1); + ch = (int)((num >> BITS_PER_CHAR * i) & ((1 << BITS_PER_CHAR) - 1)); if (ch != 0) *p++ = char_set[ch-1]; } |