Skip to content

Commit

Permalink
libsparse: add error reporting functions
Browse files Browse the repository at this point in the history
Change-Id: I2f21355b6c5339d1d724b4c121ea30d575b2d366
  • Loading branch information
colincross committed Jul 10, 2012
1 parent 9e1f17e commit a21930b
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 1 deletion.
3 changes: 2 additions & 1 deletion libsparse/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ libsparse_src_files := \
backed_block.c \
output_file.c \
sparse.c \
sparse_crc32.c
sparse_crc32.c \
sparse_err.c

include $(CLEAR_VARS)

Expand Down
18 changes: 18 additions & 0 deletions libsparse/include/sparse/sparse.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,22 @@ int sparse_file_add_fd(struct sparse_file *s,
int sparse_file_write(struct sparse_file *s, int fd, bool gz, bool sparse,
bool crc);

/**
* sparse_file_verbose - set a sparse file cookie to print verbose errors
*
* @s - sparse file cookie
*
* Print verbose sparse file errors whenever using the sparse file cookie.
*/
void sparse_file_verbose(struct sparse_file *s);

/**
* sparse_print_verbose - function called to print verbose errors
*
* By default, verbose errors will print to standard error.
* sparse_print_verbose may be overridden to log verbose errors somewhere else.
*
*/
extern void (*sparse_print_verbose)(const char *fmt, ...);

#endif
5 changes: 5 additions & 0 deletions libsparse/sparse.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,8 @@ int sparse_file_write(struct sparse_file *s, int fd, bool gz, bool sparse,

return 0;
}

void sparse_file_verbose(struct sparse_file *s)
{
s->verbose = true;
}
33 changes: 33 additions & 0 deletions libsparse/sparse_err.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include <sparse/sparse.h>

#include <stdarg.h>
#include <stdio.h>
#include <unistd.h>

void sparse_default_print(const char *fmt, ...)
{
va_list argp;

va_start(argp, fmt);
vfprintf(stderr, fmt, argp);
va_end(argp);
}

void (*sparse_print_error)(const char *fmt, ...) = sparse_default_print;
void (*sparse_print_verbose)(const char *fmt, ...) = sparse_default_print;
1 change: 1 addition & 0 deletions libsparse/sparse_file.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
struct sparse_file {
unsigned int block_size;
int64_t len;
bool verbose;

struct backed_block_list *backed_block_list;
struct output_file *out;
Expand Down

0 comments on commit a21930b

Please sign in to comment.