head	1.6;
access;
symbols
	last-version-in-peti-style:1.5
	callback-semantic-rewrite:1.4.0.2;
locks; strict;
comment	@ * @;


1.6
date	2001.08.08.19.15.27;	author rse;	state dead;
branches;
next	1.5;

1.5
date	2001.08.01.15.25.50;	author simons;	state Exp;
branches;
next	1.4;

1.4
date	2001.07.18.19.00.40;	author simons;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2001.07.16.17.50.08;	author simons;	state Exp;
branches;
next	1.2;

1.2
date	2001.07.09.19.10.06;	author simons;	state Exp;
branches;
next	1.1;

1.1
date	2001.07.09.17.16.30;	author simons;	state Exp;
branches;
next	;

1.4.2.1
date	2001.08.01.11.27.20;	author simons;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	2001.08.01.12.06.11;	author simons;	state Exp;
branches;
next	;


desc
@@


1.6
log
@First cut of the ruthless style adjustments to OSSP XDS:

o adjust source tree to follow OSSP source tree style
  by heavily combining sources into smaller sets
  (needs more work when still missing parts are added later)

o automatic re-indentation of sources with GNU indent
  (still needs manual review and adjustments; will follow)

These two heavy steps were mostly done automatically with the help of
two helper scripts written in Perl. So expect more manual adjustments to
follow...
@
text
@/*
   XDS - OSSP Extensible Data Serialization Library
   Copyright (c) 2001 The OSSP Project (http://www.ossp.org/)
   Copyright (c) 2001 Cable & Wireless Deutschland (http://www.cw.com/de/)

   This file is part of OSSP XDS, an extensible data serialization
   library which can be found at http://www.ossp.com/pkg/xds/.

   Permission to use, copy, modify, and distribute this software for
   any purpose with or without fee is hereby granted, provided that
   the above copyright notice and this permission notice appear in all
   copies.

   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
   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 <stdio.h>
#include <string.h>
#include "../internal.h"

static int dummy_engine(xds_t* xds, void* engine_context,
			void* buffer, size_t buffer_size, size_t* used_buffer_size,
			va_list* args)
    {
    if (buffer_size < 6)
	return XDS_ERR_OVERFLOW;
    else
	*used_buffer_size = 6;

    memmove(buffer, "Hallo!", 6);
    return XDS_OK;
    }

int main()
    {
    xds_t* xds;
    char*  old;
    size_t old_len;
    char*  new;
    size_t new_len;

    /* Create XDS context. */

    xds = xds_init(XDS_ENCODE);
    if (xds == NULL)
	{
	printf("Failed to initialize XDS context.\n");
	return 1;
	}

    /* Register the dummy callback under multiple names. */

    if (xds_register(xds, "text", &dummy_engine, (void*)42) != XDS_OK)
	{
	printf("Failed to register my encoding engine.\n");
	return 1;
	}

    /* Encode something, then flush the buffer by calling
       xds_getbuffer(), then encode something new and verify that the
       old buffer hasn't ben overwritten and that the new one contains
       the correct string. */

    if (xds_encode(xds, "text text") != XDS_OK)
	{
	printf("xds_encode() failed!\n");
	return 1;
	}
    if (xds_getbuffer(xds, XDS_GIFT, (void**)&old, &old_len) != XDS_OK)
	{
	printf("xds_getbuffer() failed for the first buffer!\n");
	return 1;
	}
    if (xds_encode(xds, "text") != XDS_OK)
	{
	printf("xds_encode() failed!\n");
	return 1;
	}
    if (xds_getbuffer(xds, XDS_GIFT, (void**)&new, &new_len) != XDS_OK)
	{
	printf("xds_getbuffer() failed for the second buffer!\n");
	return 1;
	}
    if ((memcmp(old, "Hallo!Hallo!", 12) != 0 || old_len != 12) &&
	(memcmp(new, "Hallo!", 6) != 0 || new_len != 6))
	{
	printf("xds_encode() did not yield the expected result.\n");
	return 1;
	}
    free(old);
    free(new);

    /* Encode somthing, then get the buffer via XDS_LOAN and verify
       the contents. Encode something new and compare the new content
       with what we expect. */

    if (xds_encode(xds, "text text") != XDS_OK)
	{
	printf("xds_encode() failed!\n");
	return 1;
	}
    if (xds_getbuffer(xds, XDS_LOAN, (void**)&old, &old_len) != XDS_OK)
	{
	printf("xds_getbuffer() failed for the first buffer!\n");
	return 1;
	}
    if (memcmp(old, "Hallo!Hallo!", 12) != 0 || old_len != 12)
	{
	printf("xds_encode() did not yield the expected result.\n");
	return 1;
	}
    if (xds_encode(xds, "text") != XDS_OK)
	{
	printf("xds_encode() failed!\n");
	return 1;
	}
    if (xds_getbuffer(xds, XDS_LOAN, (void**)&new, &new_len) != XDS_OK)
	{
	printf("xds_getbuffer() failed for the second buffer!\n");
	return 1;
	}
    if (old != new)
	{
	printf("xds_encode() allocated a new buffer even though we used XDS_LOAN.\n");
	return 1;
	}
    if (memcmp(new, "Hallo!", 6) != 0 || new_len != 6)
	{
	printf("xds_encode() did not yield the expected result.\n");
	return 1;
	}

    /* Clean up. */

    xds_destroy(xds);

    /* Everything went fine. */

    return 0;
    }
@


1.5
log
@Merged the whole contents of branch "callback-semantic-rewrite" into
the main branch. The changes there include:

 - A change of the callback semantics; callbacks do now return
   XDS_ERR_(UNDER|OVER)FLOW in case the buffer size doesn't fit.
   Rather than passing the differing byte size through the return
   code, it is stored in the location used_buffer_size points to -- a
   new parameter provided to all callbacks.

   In order to implement this, the framework, all callbacks and most
   of the test suits had to be adapted.

 - internal.h now provides the macro xds_check_parameter(), which can
   be used to verify the contents of function parameters with assert()
   and if in one line. If assert()s are deactivated, the routine will
   still return XDS_ERR_INVALID_ARG.

   Because of this change, internal.h now includes the system header
   assert.h. This means that this include coulde be removed from
   almost all modules.

 - internal.h now provides the macros xds_init_(en|de)coding_engine().
   These can be used to comfortably verify a callback's parameters and
   to verify the buffer size. All engines have been rewritten to use
   these.
@
text
@@


1.4
log
@Added missing linefeed at the end of printf() output.
@
text
@d32 3
a34 1
static int dummy_engine(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args)
d36 7
a42 2
    strncpy(buffer, "Hallo!", buffer_size);
    return 6;
d95 2
a96 2
    if ((strcmp(old, "Hallo!Hallo!") != 0 || old_len != 12) &&
	(strcmp(new, "Hallo!") != 0 || new_len != 6))
d118 1
a118 1
    if (strcmp(old, "Hallo!Hallo!") != 0 || old_len != 12)
d138 1
a138 1
    if (strcmp(new, "Hallo!") != 0 || new_len != 6)
@


1.4.2.1
log
@Modified test suits to compile with the new headers.
@
text
@d32 1
a32 3
static int dummy_engine(xds_t* xds, void* engine_context,
			void* buffer, size_t buffer_size, size_t* used_buffer_size,
			va_list* args)
@


1.4.2.2
log
@- Rewrote callback for the new semantics.

- Use memcmp() instead of strcmp() because we can't rely on trailing
  zero bytes.
@
text
@d36 2
a37 7
    if (buffer_size < 6)
	return XDS_ERR_OVERFLOW;
    else
	*used_buffer_size = 6;

    memmove(buffer, "Hallo!", 6);
    return XDS_OK;
d90 2
a91 2
    if ((memcmp(old, "Hallo!Hallo!", 12) != 0 || old_len != 12) &&
	(memcmp(new, "Hallo!", 6) != 0 || new_len != 6))
d113 1
a113 1
    if (memcmp(old, "Hallo!Hallo!", 12) != 0 || old_len != 12)
d133 1
a133 1
    if (memcmp(new, "Hallo!", 6) != 0 || new_len != 6)
@


1.3
log
@Passing va_list parameters by value is fine, unless the called routine
modifies the parameter list and you expect the change to propagate
back to the mother routine. What is what we want. Hence, I changed the
prototype of the engine callback to expect a pointer to va_list.
@
text
@d70 1
a70 1
	printf("xds_encode() failed!");
d75 1
a75 1
	printf("xds_getbuffer() failed for the first buffer!");
d80 1
a80 1
	printf("xds_encode() failed!");
d85 1
a85 1
	printf("xds_getbuffer() failed for the second buffer!");
d103 1
a103 1
	printf("xds_encode() failed!");
d108 1
a108 1
	printf("xds_getbuffer() failed for the first buffer!");
d118 1
a118 1
	printf("xds_encode() failed!");
d123 1
a123 1
	printf("xds_getbuffer() failed for the second buffer!");
@


1.2
log
@Removed unnecessary include statements.
@
text
@d32 1
a32 1
static int dummy_engine(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list args)
@


1.1
log
@Added test suite for xds_getbuffer().
@
text
@a29 2
#include <unistd.h>
#include <assert.h>
@