24823f1ab0
In all cases, the pointer was simply type-cast anyway. Let's get some compile-time type safety going, how about that. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Squashed in: xfree86: Move definition of xf86OptionPtr into separate header file The pile of spaghettis that is the xfree86 include dependencies make it rather hard to have a single typedef somewhere that's not interfering with everything else or drags in a whole bunch of other includes. Move the xf86OptionRec and GenericListRec declarations into a separate header. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
82 lines
2.4 KiB
C
82 lines
2.4 KiB
C
/**
|
|
* Copyright © 2011 Red Hat, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
#include "xf86.h"
|
|
|
|
static void
|
|
xfree86_option_list_duplicate(void)
|
|
{
|
|
XF86OptionPtr options;
|
|
XF86OptionPtr duplicate;
|
|
const char *o1 = "foo",
|
|
*o2 = "bar",
|
|
*v1 = "one",
|
|
*v2 = "two";
|
|
const char *o_null= "NULL";
|
|
char *val1, *val2;
|
|
XF86OptionPtr a, b;
|
|
|
|
duplicate = xf86OptionListDuplicate(NULL);
|
|
assert(!duplicate);
|
|
|
|
options = xf86AddNewOption(NULL, o1, v1);
|
|
assert(options);
|
|
options = xf86AddNewOption(options, o2, v2);
|
|
assert(options);
|
|
options = xf86AddNewOption(options, o_null, NULL);
|
|
assert(options);
|
|
|
|
duplicate = xf86OptionListDuplicate(options);
|
|
assert(duplicate);
|
|
|
|
val1 = xf86CheckStrOption(options, o1, "1");
|
|
val2 = xf86CheckStrOption(duplicate, o1, "2");
|
|
|
|
assert(strcmp(val1, v1) == 0);
|
|
assert(strcmp(val1, val2) == 0);
|
|
|
|
val1 = xf86CheckStrOption(options, o2, "1");
|
|
val2 = xf86CheckStrOption(duplicate, o2, "2");
|
|
|
|
assert(strcmp(val1, v2) == 0);
|
|
assert(strcmp(val1, val2) == 0);
|
|
|
|
a = xf86FindOption(options, o_null);
|
|
b = xf86FindOption(duplicate, o_null);
|
|
assert(a && b);
|
|
}
|
|
|
|
int main(int argc, char** argv)
|
|
{
|
|
xfree86_option_list_duplicate();
|
|
|
|
return 0;
|
|
}
|