head 1.8; access; symbols last-version-in-peti-style:1.7 callback-semantic-rewrite:1.6.0.2; locks; strict; comment @ * @; 1.8 date 2001.08.08.19.15.27; author rse; state dead; branches; next 1.7; 1.7 date 2001.08.01.15.25.50; author simons; state Exp; branches; next 1.6; 1.6 date 2001.07.16.17.50.08; author simons; state Exp; branches 1.6.2.1; next 1.5; 1.5 date 2001.07.09.19.10.06; author simons; state Exp; branches; next 1.4; 1.4 date 2001.07.09.17.17.33; author simons; state Exp; branches; next 1.3; 1.3 date 2001.07.08.15.58.14; author simons; state Exp; branches; next 1.2; 1.2 date 2001.07.08.15.18.50; author simons; state Exp; branches; next 1.1; 1.1 date 2001.07.08.14.06.07; author simons; state Exp; branches; next ; 1.6.2.1 date 2001.08.01.11.27.20; author simons; state Exp; branches; next 1.6.2.2; 1.6.2.2 date 2001.08.01.13.26.32; author simons; state Exp; branches; next ; desc @@ 1.8 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 #include #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) { return 0; } int main() { const char* test_names[] = { "foo", "bar", "zarah", "caesar", "claus", "heinz", }; size_t test_names_len = sizeof(test_names) / sizeof(char*); xds_t* xds; size_t i; /* Create context. */ xds = xds_init(XDS_ENCODE); if (xds == NULL) { printf("Failed to initialize XDS context.\n"); return 1; } /* Register the dummy callback under an invalid name to see whether the routine fails correctly. */ if (xds_register(xds, "abcdefh1230#", &dummy_engine, NULL) != XDS_ERR_INVALID_ARG) { printf("xds_register() illegally accepted an invalid name for the engine.\n"); return 1; } /* Register the dummy callback under multiple names. */ for(i = 0; i < test_names_len; ++i) { if (xds_register(xds, test_names[i], &dummy_engine, NULL) != XDS_OK) { printf("Failed to register engine for '%s'.\n", test_names[i]); return 1; } } /* Register the callback again, overwriting an existing entry. */ if (xds_register(xds, "claus", &dummy_engine, NULL) != XDS_OK) { printf("Failed to re-register engine for 'claus'.\n"); return 1; } /* Ensure that everything is in alphabetical order. */ for (i = 1; i < xds->engines_len; ++i) { assert(xds->engines[i-1].name != NULL); assert(xds->engines[i].name != NULL); if (strcmp(xds->engines[i-1].name, xds->engines[i].name) >= 0) { printf("xds->engines is not in alphabetical order!\n"); exit(1); } } /* Try to remove an unknown entry. */ if (xds_unregister(xds, "abacadabra") != XDS_ERR_UNKNOWN_ENGINE) { printf("xds_unregister() succeeded at removing 'abacadabra' even though it is not there.\n"); exit(1); } /* Remove an entry from the middle. */ if (xds_unregister(xds, test_names[test_names_len/2]) != XDS_OK) { printf("xds_unregister() failed to remove '%s'.\n", test_names[test_names_len/2]); exit(1); } /* Remove the last entry. */ assert(test_names_len > 0); if (xds_unregister(xds, test_names[test_names_len-1]) != XDS_OK) { printf("xds_unregister() failed to remove '%s'.\n", test_names[test_names_len-1]); exit(1); } /* Remove the first entry. */ if (xds_unregister(xds, test_names[0]) != XDS_OK) { printf("xds_unregister() failed to remove '%s'.\n", test_names[0]); exit(1); } /* Clean up. */ xds_destroy(xds); /* Everything went fine. */ return 0; } @ 1.7 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.6 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 @a29 1 #include d32 3 a34 1 static int dummy_engine(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list* args) @ 1.6.2.1 log @Modified test suits to compile with the new headers. @ text @d33 1 a33 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.6.2.2 log @Now that internal.h includes assert.h we don't need to do that anymore. @ text @d30 1 @ 1.5 log @Removed unnecessary include statements. @ text @d33 1 a33 1 static int dummy_engine(xds_t* xds, void* engine_context, void* buffer, size_t buffer_size, va_list args) @ 1.4 log @Improved the test suite. @ text @a29 1 #include @ 1.3 log @Implemented xds_unregister() function and added apropriate test cases. @ text @d41 10 d63 2 a64 1 /* Register the dummy callback under multiple names. */ d66 1 a66 1 if (xds_register(xds, "foo", &dummy_engine, NULL) != XDS_OK) d68 1 a68 1 printf("Failed to register engine for 'foo'.\n"); d71 4 a74 1 if (xds_register(xds, "bar", &dummy_engine, NULL) != XDS_OK) d76 5 a80 22 printf("Failed to register engine for 'bar'.\n"); return 1; } if (xds_register(xds, "zarah", &dummy_engine, NULL) != XDS_OK) { printf("Failed to register engine for 'zarah'.\n"); return 1; } if (xds_register(xds, "caesar", &dummy_engine, NULL) != XDS_OK) { printf("Failed to register engine for 'caesar'.\n"); return 1; } if (xds_register(xds, "claus", &dummy_engine, NULL) != XDS_OK) { printf("Failed to register engine for 'claus'.\n"); return 1; } if (xds_register(xds, "heinz", &dummy_engine, NULL) != XDS_OK) { printf("Failed to register engine for 'heinz'.\n"); return 1; d114 1 a114 1 if (xds_unregister(xds, "heinz") != XDS_OK) d116 1 a116 1 printf("xds_unregister() failed to remove 'heinz'.\n"); d122 2 a123 1 if (xds_unregister(xds, "zarah") != XDS_OK) d125 1 a125 1 printf("xds_unregister() failed to remove 'bar'.\n"); d131 1 a131 1 if (xds_unregister(xds, "bar") != XDS_OK) d133 1 a133 1 printf("xds_unregister() failed to remove 'bar'.\n"); @ 1.2 log @- Removed the sanity checking code from dummy_callback: It won't be called in this test suite. Hence, the context for the registered callbacks can be NULL. - Fixed old comments, which do not apply anymore. - Added test at the end that ensures the entries are in alphabetical order. @ text @d107 32 @ 1.1 log @Test module for the xds_register() function. @ text @d29 1 d31 1 a35 20 if (xds == NULL) { printf("XDS context isn't passed through to registered engine.\n"); exit(1); } if (engine_context != (void*)42) { printf("Engine context isn't passed through to registered engine.\n"); exit(1); } if (buffer == NULL) { printf("Buffer passed to engine is NULL.\n"); exit(1); } if (buffer_size == 0) { printf("Buffer size passed to engine is NULL.\n"); exit(1); } d42 1 d44 1 a44 1 /* Create contexts for encoding and decoding. */ d48 4 a51 4 { printf("Failed to initialize XDS context.\n"); return 1; } d55 1 a55 1 if (xds_register(xds, "foo", &dummy_engine, (void*)42) != XDS_OK) d60 1 a60 1 if (xds_register(xds, "bar", &dummy_engine, (void*)42) != XDS_OK) d65 1 a65 1 if (xds_register(xds, "zarah", &dummy_engine, (void*)42) != XDS_OK) d70 1 a70 1 if (xds_register(xds, "caesar", &dummy_engine, (void*)42) != XDS_OK) d75 1 a75 1 if (xds_register(xds, "claus", &dummy_engine, (void*)42) != XDS_OK) d80 1 a80 1 if (xds_register(xds, "heinz", &dummy_engine, (void*)42) != XDS_OK) d84 21 @