diff options
Diffstat (limited to 'ubifs-utils/common')
| -rw-r--r-- | ubifs-utils/common/lpt.c | 10 | ||||
| -rw-r--r-- | ubifs-utils/common/ubifs.h | 13 | 
2 files changed, 17 insertions, 6 deletions
| diff --git a/ubifs-utils/common/lpt.c b/ubifs-utils/common/lpt.c index 9c1143f..d07f569 100644 --- a/ubifs-utils/common/lpt.c +++ b/ubifs-utils/common/lpt.c @@ -421,7 +421,7 @@ int create_lpt(struct ubifs_info *c)  			alen = ALIGN(len, c->min_io_size);  			set_ltab(c, lnum, c->leb_size - alen, alen - len);  			memset(p, 0xff, alen - len); -			err = write_leb(lnum++, alen, buf); +			err = write_leb(c, lnum++, alen, buf);  			if (err)  				goto out;  			p = buf; @@ -468,7 +468,7 @@ int create_lpt(struct ubifs_info *c)  				set_ltab(c, lnum, c->leb_size - alen,  					    alen - len);  				memset(p, 0xff, alen - len); -				err = write_leb(lnum++, alen, buf); +				err = write_leb(c, lnum++, alen, buf);  				if (err)  					goto out;  				p = buf; @@ -515,7 +515,7 @@ int create_lpt(struct ubifs_info *c)  			alen = ALIGN(len, c->min_io_size);  			set_ltab(c, lnum, c->leb_size - alen, alen - len);  			memset(p, 0xff, alen - len); -			err = write_leb(lnum++, alen, buf); +			err = write_leb(c, lnum++, alen, buf);  			if (err)  				goto out;  			p = buf; @@ -538,7 +538,7 @@ int create_lpt(struct ubifs_info *c)  		alen = ALIGN(len, c->min_io_size);  		set_ltab(c, lnum, c->leb_size - alen, alen - len);  		memset(p, 0xff, alen - len); -		err = write_leb(lnum++, alen, buf); +		err = write_leb(c, lnum++, alen, buf);  		if (err)  			goto out;  		p = buf; @@ -558,7 +558,7 @@ int create_lpt(struct ubifs_info *c)  	/* Write remaining buffer */  	memset(p, 0xff, alen - len); -	err = write_leb(lnum, alen, buf); +	err = write_leb(c, lnum, alen, buf);  	if (err)  		goto out; diff --git a/ubifs-utils/common/ubifs.h b/ubifs-utils/common/ubifs.h index 502a39a..5a909f6 100644 --- a/ubifs-utils/common/ubifs.h +++ b/ubifs-utils/common/ubifs.h @@ -278,6 +278,8 @@ struct ubifs_znode   * @program_type: used to identify the type of current program   * @program_name: program name   * @dev_name: device name + * @dev_fd: opening handler for an UBI volume or an image file + * @libubi: opening handler for libubi   *   * @jhead_cnt: count of journal heads   * @max_bud_bytes: maximum number of bytes allowed in buds @@ -370,6 +372,8 @@ struct ubifs_info  	int program_type;  	const char *program_name;  	char *dev_name; +	int dev_fd; +	libubi_t libubi;  	int jhead_cnt;  	long long max_bud_bytes; @@ -482,6 +486,13 @@ struct ubifs_branch *ubifs_idx_branch(const struct ubifs_info *c,  				       (UBIFS_BRANCH_SZ + c->key_len + c->hash_len) * bnum);  } -int write_leb(int lnum, int len, void *buf); +int write_leb(struct ubifs_info *c, int lnum, int len, void *buf); + +/* super.c */ +int open_ubi(struct ubifs_info *c, const char *node); +void close_ubi(struct ubifs_info *c); +int open_target(struct ubifs_info *c); +int close_target(struct ubifs_info *c); +int check_volume_empty(struct ubifs_info *c);  #endif /* __UBIFS_H__ */ | 
