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.2 and 1.3.2.2

version 1.2, 2011/05/09 14:36:33	version 1.3.2.2, 2012/11/13 13:19:15
Line 12 terms:	Line 12 terms:
All of the documentation and software included in the ELWIX and AITNET	All of the documentation and software included in the ELWIX and AITNET
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

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

Redistribution and use in source and binary forms, with or without	Redistribution and use in source and binary forms, with or without
Line 47 SUCH DAMAGE.	Line 47 SUCH DAMAGE.
#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 60 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 68 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 87 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 101 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 111 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.2
changed lines
	Added in v.1.3.2.2