diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2005-02-21 21:08:27 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2005-02-21 21:08:27 +0000 |
| commit | 85eb751e4e1683af6cee3ee9dce29f74911a639d (patch) | |
| tree | b40f699ee646462a8f223b919ba68dda1d8fc371 /src/ArgList.c | |
| parent | 94150cb72d9d641c64325cd70323d93b9a3701a5 (diff) | |
Convert lib/Xt to ANSI C (Thomas Dickey). Fixes for a few valgrind warningsXORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_1
(Thomas Dickey).
Diffstat (limited to 'src/ArgList.c')
| -rw-r--r-- | src/ArgList.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/ArgList.c b/src/ArgList.c index 5b3e720..f893b9d 100644 --- a/src/ArgList.c +++ b/src/ArgList.c @@ -29,13 +29,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -54,11 +54,11 @@ SOFTWARE. * This routine merges two arglists. It does NOT check for duplicate entries. */ -ArgList XtMergeArgLists(args1, num_args1, args2, num_args2) - ArgList args1; - Cardinal num_args1; - ArgList args2; - Cardinal num_args2; +ArgList XtMergeArgLists( + ArgList args1, + Cardinal num_args1, + ArgList args2, + Cardinal num_args2) { ArgList result, args; @@ -72,5 +72,3 @@ ArgList XtMergeArgLists(args1, num_args1, args2, num_args2) return result; } - - |