move.c		move.c
	/* (C) 2008-2010 D. V. Wiebe		/* Copyright (C) 2008-2010 D. V. Wiebe
	*		*
	************************************************************************** *		************************************************************************** *
	*		*
	* This file is part of the GetData project.		* This file is part of the GetData project.
	*		*
	* GetData is free software; you can redistribute it and/or modify it under		* GetData is free software; you can redistribute it and/or modify it under
	* the terms of the GNU Lesser General Public License as published by the		* the terms of the GNU Lesser General Public License as published by the
	* Free Software Foundation; either version 2.1 of the License, or (at your		* Free Software Foundation; either version 2.1 of the License, or (at your
	* option) any later version.		* option) any later version.
	*		*
	skipping to change at line 398		skipping to change at line 398
	strcmpnull(D->fragment[E->fragment_index].sname,		strcmpnull(D->fragment[E->fragment_index].sname,
	D->fragment[new_fragment].sname)))		D->fragment[new_fragment].sname)))
	{		{
	new_filebase = (char *)malloc(FILENAME_MAX);		new_filebase = (char *)malloc(FILENAME_MAX);
	if (new_filebase == NULL) {		if (new_filebase == NULL) {
	_GD_SetError(D, GD_E_ALLOC, 0, NULL, 0, NULL);		_GD_SetError(D, GD_E_ALLOC, 0, NULL, 0, NULL);
	dreturn("%i", -1);		dreturn("%i", -1);
	return -1;		return -1;
	}		}
	if (D->fragment[new_fragment].sname)		snprintf(new_filebase, FILENAME_MAX, "%s/%s",
	snprintf(new_filebase, FILENAME_MAX, "%s/%s/%s", D->name,		D->fragment[new_fragment].sname ? D->fragment[new_fragment].sname :
	D->fragment[new_fragment].sname, E->field);		D->name, E->field);
	else
	snprintf(new_filebase, FILENAME_MAX, "%s/%s", D->name, E->field);
	if (_GD_MogrifyFile(D, E, D->fragment[new_fragment].encoding,		if (_GD_MogrifyFile(D, E, D->fragment[new_fragment].encoding,
	D->fragment[new_fragment].byte_sex,		D->fragment[new_fragment].byte_sex,
	D->fragment[new_fragment].frame_offset, 1, new_fragment,		D->fragment[new_fragment].frame_offset, 1, new_fragment,
	new_filebase))		new_filebase))
	{		{
	dreturn("%i", -1);		dreturn("%i", -1);
	return -1;		return -1;
	}		}
	}		}
End of changes. 2 change blocks.
	6 lines changed or deleted		4 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/