libaitsync/src/patch.c - diff

Return to patch.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitsync / src

Diff for /libaitsync/src/patch.c between versions 1.1.1.1.2.1 and 1.4

version 1.1.1.1.2.1, 2010/03/24 16:04:49	version 1.4, 2012/11/13 14:19:39
Line 5	Line 5
* $Author$	* $Author$
* $Id$	* $Id$
*	*
*************************************************************************/	**************************************************************************
	The ELWIX and AITNET software is distributed under the following
	terms:

	All of the documentation and software included in the ELWIX and AITNET
	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
	by Michael Pounov <misho@elwix.org>. All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	1. Redistributions of source code must retain the above copyright
	notice, this list of conditions and the following disclaimer.
	2. Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following disclaimer in the
	documentation and/or other materials provided with the distribution.
	3. All advertising materials mentioning features or use of this software
	must display the following acknowledgement:
	This product includes software developed by Michael Pounov <misho@elwix.org>
	ELWIX - Embedded LightWeight unIX and its contributors.
	4. Neither the name of AITNET nor the names of its contributors
	may be used to endorse or promote products derived from this software
	without specific prior written permission.

	THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGE.
	*/
#include "global.h"	#include "global.h"
#include "patch.h"	#include "patch.h"


int sync_buildPatch(void * __restrict buf, u_int buflen, struct tagPiece ** __restrict arr)	/*
	* sync_buildPatch() - Build patch from buffer to pieces array
	*
	* @buf = Input buffer
	* @buflen = Buffer length
	* @arr = Array from pieces
	* return: -1 error, != -1 num pieces
	*/
	int
	sync_buildPatch(void * __restrict buf, u_int buflen, struct tagPiece ** __restrict arr)
{	{
void *pos;	void *pos;
sync_chunk_t prefix, suffix;	sync_chunk_t prefix, suffix;
Line 23 int sync_buildPatch(void * __restrict buf, u_int bufle	Line 69 int sync_buildPatch(void * __restrict buf, u_int bufle

a = malloc(sizeof(struct tagPiece));	a = malloc(sizeof(struct tagPiece));
if (!a) {	if (!a) {
SETERR;	LOGERR;
return -1;	return -1;
} else	} else
memset(a, 0, sizeof(struct tagPiece));	memset(a, 0, sizeof(struct tagPiece));
Line 31 int sync_buildPatch(void * __restrict buf, u_int bufle	Line 77 int sync_buildPatch(void * __restrict buf, u_int bufle
for (pos = buf, i = 0; len && pos < buf + buflen; i++) {	for (pos = buf, i = 0; len && pos < buf + buflen; i++) {
a = realloc(a, sizeof(struct tagPiece) * (i + 2));	a = realloc(a, sizeof(struct tagPiece) * (i + 2));
if (!a) {	if (!a) {
SETERR;	LOGERR;
return -1;	return -1;
} else {	} else {
memset(&a[i + 1], 0, sizeof(struct tagPiece));	memset(&a[i + 1], 0, sizeof(struct tagPiece));
// printf("%d.prefix_pos=%p len=%d\n", i, pos, len);	#if 0
	printf("start: %d.prefix_pos=%p len=%d\n", i, pos, len);
	#endif

// prefix chunk	/* prefix chunk */
prefix = pos;	prefix = pos;
if (prefix->sc_magic != DLTSYNC_MAGIC) {	if (prefix->sc_magic != DLTSYNC_MAGIC) {
if (a) {	if (a) {
Line 50 int sync_buildPatch(void * __restrict buf, u_int bufle	Line 98 int sync_buildPatch(void * __restrict buf, u_int bufle
pos += sizeof(sync_chunk_t);	pos += sizeof(sync_chunk_t);
len -= sizeof(sync_chunk_t);	len -= sizeof(sync_chunk_t);
}	}
// printf("%d.prefix=%p pos=%p len=%d\n", i, a[i].pfx, pos, len);	#if 0
	printf("prefix: %d.prefix=%p pos=%p len=%d\n", i, a[i].pfx, pos, len);
	#endif

// data	/* data */
if (!len) {	if (!len) {
if (a) {	if (a) {
free(a);	free(a);
Line 64 int sync_buildPatch(void * __restrict buf, u_int bufle	Line 114 int sync_buildPatch(void * __restrict buf, u_int bufle
pos += prefix->sc_len;	pos += prefix->sc_len;
len -= prefix->sc_len;	len -= prefix->sc_len;
}	}
// printf("%d.data=%p pos=%p len=%d\n", i, a[i].buf, pos, len);	#if 0
	printf("data: %d.data=%p pos=%p len=%d\n", i, a[i].buf, pos, len);
	#endif

// if find sync chunk	/* if find sync chunk */
if (len) {	if (len) {
suffix = pos;	suffix = pos;
if (SIGSYNC_MAGIC == suffix->sc_magic) {	if (SIGSYNC_MAGIC == suffix->sc_magic) {
Line 74 int sync_buildPatch(void * __restrict buf, u_int bufle	Line 126 int sync_buildPatch(void * __restrict buf, u_int bufle
pos += sizeof(sync_chunk_t);	pos += sizeof(sync_chunk_t);
len -= sizeof(sync_chunk_t);	len -= sizeof(sync_chunk_t);
}	}
// printf("%d.data=%p pos=%p len=%d\n", i, a[i].sfx, pos, len);	#if 0
	printf("suffix: %d.data=%p pos=%p len=%d\n", i, a[i].sfx, pos, len);
	#endif
}	}
}	}
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1.2.1
changed lines
	Added in v.1.4