ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 6baab44e: Merge "Fix build"

Browse source 
* commit '6baab44eed58ed647cfd18a117e6ea9f9a52c2a5':
  Fix build
This commit is contained in:
Sami Tolvanen 2015-03-26 12:02:35 +00:00 • committed by Android Git Automerger
commit 6ca1dbd442
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
fs_mgr/fs_mgr_verity.c
View file

@ -463,15 +463,15 @@ static int was_verity_restart()
static int metadata_add(FILE *fp, long start, const char *tag, static int metadata_add(FILE *fp, long start, const char *tag,
unsigned int length, off64_t *offset) unsigned int length, off64_t *offset)
{ {
if (TEMP_FAILURE_RETRY(fseek(fp, start, SEEK_SET)) < 0 || if (fseek(fp, start, SEEK_SET) < 0 ||
TEMP_FAILURE_RETRY(fprintf(fp, "%s %u\n", tag, length)) < 0) { fprintf(fp, "%s %u\n", tag, length) < 0) {
return -1; return -1;
} }
*offset = ftell(fp); *offset = ftell(fp);
if (TEMP_FAILURE_RETRY(fseek(fp, length, SEEK_CUR)) < 0 || if (fseek(fp, length, SEEK_CUR) < 0 ||
TEMP_FAILURE_RETRY(fprintf(fp, METADATA_EOD " 0\n")) < 0) { fprintf(fp, METADATA_EOD " 0\n") < 0) {
return -1; return -1;
} }
@ -493,7 +493,7 @@ static int metadata_find(const char *fname, const char *stag,
return -1; return -1;
} }
fp = TEMP_FAILURE_RETRY(fopen(fname, "r+")); fp = fopen(fname, "r+");
if (!fp) { if (!fp) {
ERROR("Failed to open %s (%s)\n", fname, strerror(errno)); ERROR("Failed to open %s (%s)\n", fname, strerror(errno));
@ -501,8 +501,8 @@ static int metadata_find(const char *fname, const char *stag,
} }
/* check magic */ /* check magic */
if (TEMP_FAILURE_RETRY(fseek(fp, start, SEEK_SET)) < 0 || if (fseek(fp, start, SEEK_SET) < 0 ||
TEMP_FAILURE_RETRY(fread(&magic, sizeof(magic), 1, fp)) != 1) { fread(&magic, sizeof(magic), 1, fp) != 1) {
ERROR("Failed to read magic from %s (%s)\n", fname, strerror(errno)); ERROR("Failed to read magic from %s (%s)\n", fname, strerror(errno));
goto out; goto out;
} }
@ -510,8 +510,8 @@ static int metadata_find(const char *fname, const char *stag,
if (magic != METADATA_MAGIC) { if (magic != METADATA_MAGIC) {
magic = METADATA_MAGIC; magic = METADATA_MAGIC;
if (TEMP_FAILURE_RETRY(fseek(fp, start, SEEK_SET)) < 0 || if (fseek(fp, start, SEEK_SET) < 0 ||
TEMP_FAILURE_RETRY(fwrite(&magic, sizeof(magic), 1, fp)) != 1) { fwrite(&magic, sizeof(magic), 1, fp) != 1) {
ERROR("Failed to write magic to %s (%s)\n", fname, strerror(errno)); ERROR("Failed to write magic to %s (%s)\n", fname, strerror(errno));
goto out; goto out;
} }
@ -527,9 +527,8 @@ static int metadata_find(const char *fname, const char *stag,
start += sizeof(magic); start += sizeof(magic);
while (1) { while (1) {
n = TEMP_FAILURE_RETRY(fscanf(fp, n = fscanf(fp, "%" STRINGIFY(METADATA_TAG_MAX_LENGTH) "s %u\n",
"%" STRINGIFY(METADATA_TAG_MAX_LENGTH) "s %u\n", tag, &length);
tag, &length));
if (n == 2 && strcmp(tag, METADATA_EOD)) { if (n == 2 && strcmp(tag, METADATA_EOD)) {
/* found a tag */ /* found a tag */
@ -543,7 +542,7 @@ static int metadata_find(const char *fname, const char *stag,
start += length; start += length;
if (TEMP_FAILURE_RETRY(fseek(fp, length, SEEK_CUR)) < 0) { if (fseek(fp, length, SEEK_CUR) < 0) {
ERROR("Failed to seek %s (%s)\n", fname, strerror(errno)); ERROR("Failed to seek %s (%s)\n", fname, strerror(errno));
goto out; goto out;
} }
@ -559,8 +558,8 @@ static int metadata_find(const char *fname, const char *stag,
out: out:
if (fp) { if (fp) {
TEMP_FAILURE_RETRY(fflush(fp)); fflush(fp);
TEMP_FAILURE_RETRY(fclose(fp)); fclose(fp);
} }
return rc; return rc;