Roland Mainz wrote:
> April Chin wrote:
[snip]
> > ./lib/libast/common/misc/optctx.c
>
> These five can AFAIK be removed ("optctx.c" is a valid source file but I
> forgot to hook it up in Makefile.com ... but nothing in the current
> OS/Net codebase uses it and to make this issue short: remove it
> (otherwise we need a reviewer for the one-liner and I doubt any of the
> reviewers is still around)).
Ahhggrrlrlll... this issue is so... <censored>> (my fault). The problem
works like this:
Somehow during a source rename something went wrong and "optctx.c" was
accidently called "optoptctx.c". That's why "optctx.c" shows-up as
unreferenced and optoptctx.c doesn't exist in the upstream sources but
has the CPL license. Grrr.... this is so... <censored>.
I've attached the fix for this as
"ksh93_integration_optoptctx_rename001.diff.txt" - it removes the
"optoptctx.c" file which is identical to "optctx.c" (therefore no extra
review required for this file) and adjusts
usr/src/lib/libast/Makefile.com to use the correct source...
... can anyone please review this patch ASAP, please ?
----
Bye,
Roland
--
__ . . __
(o.\ \/ /.o) [email protected]
\__\/\/__/ MPEG specialist, C&&JAVA&&Sun&&Unix programmer
/O /==\ O\ TEL +49 641 3992797
(;O/ \/ \O;)
Index: src/lib/libast/common/misc/optoptctx.c
===================================================================
--- src/lib/libast/common/misc/optoptctx.c (revision 1335)
+++ src/lib/libast/common/misc/optoptctx.c (working copy)
@@ -1,70 +0,0 @@
-/***********************************************************************
-* *
-* This software is part of the ast package *
-* Copyright (c) 1985-2007 AT&T Knowledge Ventures *
-* and is licensed under the *
-* Common Public License, Version 1.0 *
-* by AT&T Knowledge Ventures *
-* *
-* A copy of the License is available at *
-* http://www.opensource.org/licenses/cpl1.0.txt *
-* (with md5 checksum 059e8cd6165cb4c31e351f2b69388fd9) *
-* *
-* Information and Software Systems Research *
-* AT&T Research *
-* Florham Park NJ *
-* *
-* Glenn Fowler <[email protected]> *
-* David Korn <[email protected]> *
-* Phong Vo <[email protected]> *
-* *
-***********************************************************************/
-#pragma prototyped
-/*
- * Glenn Fowler
- * AT&T Research
- *
- * _opt_infop_ context control
- *
- * allocate new context:
- * new_context = optctx(0, 0);
- * free new context:
- * optctx(0, new_context);
- * switch to new_context:
- * old_context = optctx(new_context, 0);
- * switch to old_context and free new_context:
- * optctx(old_context, new_context);
- */
-
-#include <optlib.h>
-
-static Opt_t* freecontext;
-
-Opt_t*
-optctx(Opt_t* p, Opt_t* o)
-{
- if (o)
- {
- if (freecontext)
- free(o);
- else
- freecontext = o;
- if (!p)
- return 0;
- }
- if (p)
- {
- o = _opt_infop_;
- _opt_infop_ = p;
- }
- else
- {
- if (o = freecontext)
- freecontext = 0;
- else if (!(o = newof(0, Opt_t, 1, 0)))
- return 0;
- memset(o, 0, sizeof(Opt_t));
- o->state = _opt_infop_->state;
- }
- return o;
-}
Index: src/lib/libast/Makefile.com
===================================================================
--- src/lib/libast/Makefile.com (revision 1335)
+++ src/lib/libast/Makefile.com (working copy)
@@ -202,7 +202,7 @@
common/misc/optesc.o \
common/misc/optget.o \
common/misc/optjoin.o \
- common/misc/optoptctx.o \
+ common/misc/optctx.o \
common/misc/procclose.o \
common/misc/procfree.o \
common/misc/procopen.o \
_______________________________________________
opensolaris-code mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/opensolaris-code
