"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "fsremap/src/io/extent_file.cc" between
fstransform-0.9.3-src.tar.gz and fstransform-0.9.4.tar.gz

About: fstransform is a tool to change a file-system from one format to another, for example from jfs, xfs, or reiser to ext2, ext3, or ext4, in-place and without the need for backup.

extent_file.cc  (fstransform-0.9.3-src)	:	extent_file.cc  (fstransform-0.9.4)
skipping to change at line 60		skipping to change at line 60
{		{
{		{
char header[200];		char header[200];
for (ft_size i = 0; i < 6; i++) {		for (ft_size i = 0; i < 6; i++) {
if (fgets(header, sizeof(header), f) == NULL || header[0] != '#')		if (fgets(header, sizeof(header), f) == NULL || header[0] != '#')
return EPROTO;		return EPROTO;
}		}
}		}
ft_ull physical, logical, length = 0, user_data;		ft_ull physical, logical, length = 0, user_data;
if (fscanf(f, "count %"FT_ULL"\n", & length) != 1)		if (fscanf(f, "count %" FT_ULL "\n", & length) != 1)
return EPROTO;		return EPROTO;
if (fscanf(f, "physical\tlogical\tlength\tuser_data\n") < 0)		if (fscanf(f, "physical\tlogical\tlength\tuser_data\n") < 0)
return EPROTO;		return EPROTO;
ft_uoff block_size_bitmask = ret_block_size_bitmask;		ft_uoff block_size_bitmask = ret_block_size_bitmask;
ft_size i = ret_list.size(), n = (ft_size) length;		ft_size i = ret_list.size(), n = (ft_size) length;
ret_list.resize(n += i);		ret_list.resize(n += i);
for (; i < n; i++) {		for (; i < n; i++) {
if (fscanf(f, "%"FT_ULL" %"FT_ULL" %"FT_ULL" %"FT_ULL"\n", &physical, &l ogical, &length, &user_data) != 4)		if (fscanf(f, "%" FT_ULL " %" FT_ULL " %" FT_ULL " %" FT_ULL "\n", &phys ical, &logical, &length, &user_data) != 4)
return EPROTO;		return EPROTO;
fr_extent<ft_uoff> & extent = ret_list[i];		fr_extent<ft_uoff> & extent = ret_list[i];
block_size_bitmask |=		block_size_bitmask |=
(extent.physical() = (ft_uoff) physical) |		(extent.physical() = (ft_uoff) physical) |
(extent.logical() = (ft_uoff) logical) |		(extent.logical() = (ft_uoff) logical) |
(extent.length() = (ft_uoff) length);		(extent.length() = (ft_uoff) length);
extent.user_data() = (ft_size) user_data;		extent.user_data() = (ft_size) user_data;
skipping to change at line 103		skipping to change at line 103
*/		*/
int ff_save_extents_file(FILE * f, const fr_vector<ft_uoff> & extent_list)		int ff_save_extents_file(FILE * f, const fr_vector<ft_uoff> & extent_list)
{		{
fprintf(f, "%s",		fprintf(f, "%s",
"################################################################### #############\n"		"################################################################### #############\n"
"###################### DO NOT EDIT THIS FILE ! ################### #############\n"		"###################### DO NOT EDIT THIS FILE ! ################### #############\n"
"################################################################### #############\n"		"################################################################### #############\n"
"############# This file was automatically generated by fsremap. ############\n"		"############# This file was automatically generated by fsremap. ############\n"
"############# Any change you may do will CORRUPT resuming this job! ############\n"		"############# Any change you may do will CORRUPT resuming this job! ############\n"
"################################################################### #############\n");		"################################################################### #############\n");
fprintf(f, "count %"FT_ULL"\n", (ft_ull) extent_list.size());		fprintf(f, "count %" FT_ULL "\n", (ft_ull) extent_list.size());
fprintf(f, "physical\tlogical\tlength\tuser_data\n");		fprintf(f, "physical\tlogical\tlength\tuser_data\n");
fr_vector<ft_uoff>::const_iterator iter = extent_list.begin(), end = extent_ list.end();		fr_vector<ft_uoff>::const_iterator iter = extent_list.begin(), end = extent_ list.end();
for (; iter != end; ++iter) {		for (; iter != end; ++iter) {
const fr_extent<ft_uoff> & extent = *iter;		const fr_extent<ft_uoff> & extent = *iter;
if (fprintf(f, "%"FT_ULL"\t%"FT_ULL"\t%"FT_ULL"\t%"FT_ULL"\n",		if (fprintf(f, "%" FT_ULL "\t%" FT_ULL "\t%" FT_ULL "\t%" FT_ULL "\n",
(ft_ull)extent.physical(), (ft_ull)extent.logical(), (ft_ull )extent.length(), (ft_ull)extent.user_data())		(ft_ull)extent.physical(), (ft_ull)extent.logical(), (ft_ull )extent.length(), (ft_ull)extent.user_data())
<= 0)		<= 0)
break;		break;
}		}
return iter == end ? 0 : errno;		return iter == end ? 0 : errno;
}		}
FT_IO_NAMESPACE_END		FT_IO_NAMESPACE_END
End of changes. 4 change blocks.
4 lines changed or deleted		4 lines changed or added

---