Merge branch 'maint-1.6.5' into maint

diff --git a/fsck.h b/fsck.h
index 990ee02335a2e2693e32baa82b259c23843f2aa0..1e4f527318ea4b4d701a27e08d68f3551173f176 100644 (file)
--- a/fsck.h
+++ b/fsck.h
@@ -17,13 +17,14 @@ typedef int (*fsck_walk_func)(struct object *obj, int type, void *data);
 /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
 typedef int (*fsck_error)(struct object *obj, int type, const char *err, ...);
 
+__attribute__((format (printf, 3, 4)))
 int fsck_error_function(struct object *obj, int type, const char *fmt, ...);
 
 /* descend in all linked child objects
  * the return value is:
  *    -1       error in processing the object
  *    <0       return value of the callback, which lead to an abort
- *    >0       return value of the first sigaled error >0 (in the case of no other errors)
+ *    >0       return value of the first signaled error >0 (in the case of no other errors)
  *    0                everything OK
  */
 int fsck_walk(struct object *obj, fsck_walk_func walk, void *data);