From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (fantadrom.bsd.lv [local])
	by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id b83d7f4b
	for <source@mdocml.bsd.lv>;
	Fri, 15 Jul 2016 14:33:31 -0500 (EST)
Date: Fri, 15 Jul 2016 14:33:31 -0500 (EST)
Message-Id: <15489725859697430873.enqueue@fantadrom.bsd.lv>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: To remove the const qualifier from a pointer to an object - 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
To remove the const qualifier from a pointer to an object - either 
because we know it is actually mutable or because we are passing
it to a function that doesn't accept a const object but won't
actually attempt to modify it - simply casting from (const type *)
to (type *) is legal C and clearly expresses the intent.  
So get rid of the obfuscating UNCONST macro.
Basic idea discussed with guenther@.

Modified Files:
--------------
    mdocml:
        main.c
        main.h

Revision Data
-------------
Index: main.h
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -Lmain.h -Lmain.h -u -p -r1.25 -r1.26
--- main.h
+++ main.h
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define	UNCONST(a)	((void *)(uintptr_t)(const void *)(a))
-
 struct	roff_man;
 struct	manoutput;
 
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.271
retrieving revision 1.272
diff -Lmain.c -Lmain.c -u -p -r1.271 -r1.272
--- main.c
+++ main.c
@@ -980,7 +980,7 @@ woptions(struct curparse *curp, char *ar
 
 	while (*arg) {
 		o = arg;
-		switch (getsubopt(&arg, UNCONST(toks), &v)) {
+		switch (getsubopt(&arg, (char * const *)toks, &v)) {
 		case 0:
 			curp->wstop = 1;
 			break;
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv