diff options
| author | JP Abgrall <jpa@google.com> | 2014-03-06 13:50:20 -0800 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2014-03-06 13:50:20 -0800 |
| commit | 65f0aab98b20b5994a726ab90d355248bcddfffd (patch) | |
| tree | 2b7c0cf831d8255e3b0d1bab367609100a7e0f18 /lib/ss/error.c | |
| parent | 66b7b06812cc7ae835e0c0ed2656d1a27580c5ed (diff) | |
| download | android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.tar.gz android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.tar.bz2 android_external_e2fsprogs-65f0aab98b20b5994a726ab90d355248bcddfffd.zip | |
Revert changes that moved from 1.41.14 to 1.42.9
Revert "e2fsck: Don't use e2fsck_global_ctx unless HAVE_SIGNAL_H"
commit e80e74c41d85ff93f3d212ba6512340f48054a93.
Revert "Merge remote-tracking branch 'linaro/linaro-1.42.9' into aosp_master"
This reverts commit e97b2b6fc82f840e84dfc631b87f21be44ff2421, reversing
changes made to 7e2fb9d09c245eba70ee008b78007315e9c0f1df.
Revert "Prepare for upstream 1.42.9"
This reverts commit 7e2fb9d09c245eba70ee008b78007315e9c0f1df.
Bug: 13340735
Change-Id: If48b153a95ef5f69f7cdccb00e23524abff3c5a8
Signed-off-by: JP Abgrall <jpa@google.com>
Diffstat (limited to 'lib/ss/error.c')
| -rw-r--r-- | lib/ss/error.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/ss/error.c b/lib/ss/error.c index c7ebc4a2..9a4b5269 100644 --- a/lib/ss/error.c +++ b/lib/ss/error.c @@ -14,12 +14,13 @@ #include <stdio.h> -#include "et/com_err.h" +#include <com_err.h> #include "ss_internal.h" #include <stdarg.h> -char *ss_name(int sci_idx) +char * ss_name(sci_idx) + int sci_idx; { register char *ret_val; register ss_data *infop; @@ -68,7 +69,10 @@ void ss_error (int sci_idx, long code, const char * fmt, ...) va_end(pvar); } -void ss_perror(int sci_idx, long code, char const *msg) /* for compatibility */ +void ss_perror (sci_idx, code, msg) /* for compatibility */ + int sci_idx; + long code; + char const *msg; { ss_error (sci_idx, code, "%s", msg); } |