Revision: 50664
http://brlcad.svn.sourceforge.net/brlcad/?rev=50664&view=rev
Author: tbrowder2
Date: 2012-05-24 19:58:38 +0000 (Thu, 24 May 2012)
Log Message:
-----------
don't clear length flags for 'l' or 'h' UNTIL we check for doubling--this
should fix the 32-bit failure
Modified Paths:
--------------
brlcad/trunk/src/libbu/vls.c
Modified: brlcad/trunk/src/libbu/vls.c
===================================================================
--- brlcad/trunk/src/libbu/vls.c 2012-05-24 19:50:49 UTC (rev 50663)
+++ brlcad/trunk/src/libbu/vls.c 2012-05-24 19:58:38 UTC (rev 50664)
@@ -780,23 +780,25 @@
} else if (*ep == 'z') {
flags |= SIZETINT;
} else if (*ep == 'l') {
- /* clear all length modifiers first */
- flags ^= ALL_LENGTHMODS;
+ /* 'l' can be doubled */
+ /* clear all length modifiers AFTER we check for the
+ first 'l' */
if (flags & LONG_INT) {
- /* 'l' can be doubled, this step recognizes that */
- flags |= LLONGINT;
+ flags ^= ALL_LENGTHMODS;
+ flags |= LLONGINT;
} else {
- /* set the new flag */
- flags |= LONG_INT;
+ flags ^= ALL_LENGTHMODS;
+ flags |= LONG_INT;
}
} else if (*ep == 'h') {
- /* clear all length modifiers first */
- flags ^= ALL_LENGTHMODS;
+ /* 'h' can be doubled */
+ /* clear all length modifiers AFTER we check for the
+ first 'h' */
if (flags & SHORTINT) {
- /* 'h' can be doubled, this step recognizes that */
+ flags ^= ALL_LENGTHMODS;
flags |= SHHRTINT;
} else {
- /* set the new flag */
+ flags ^= ALL_LENGTHMODS;
flags |= SHORTINT;
}
} else if (*ep == 'L') {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
