[brlcad-commits] SF.net SVN: brlcad:[46382] brlcad/trunk/src/libgcv/wfobj

[<n_...@us...>]

Revision: 46382
          http://brlcad.svn.sourceforge.net/brlcad/?rev=46382&view=rev
Author:   n_reed
Date:     2011-08-24 21:13:48 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Changed obj_parser_set_extra return type from void* to more appropriate void. Removed unused YY_INPUT macro.

Modified Paths:
--------------
    brlcad/trunk/src/libgcv/wfobj/obj_rules.h
    brlcad/trunk/src/libgcv/wfobj/obj_rules.re

Modified: brlcad/trunk/src/libgcv/wfobj/obj_rules.h
===================================================================
--- brlcad/trunk/src/libgcv/wfobj/obj_rules.h	2011-08-24 21:11:43 UTC (rev 46381)
+++ brlcad/trunk/src/libgcv/wfobj/obj_rules.h	2011-08-24 21:13:48 UTC (rev 46382)
@@ -21,7 +21,7 @@
 void obj_parser_lex_destroy(yyscan_t scanner);
 int obj_parser_lex(YYSTYPE *tokenValue, yyscan_t scanner);
 void *obj_parser_get_extra(yyscan_t scanner);
-void *obj_parser_set_extra(yyscan_t scanner, void *extra);
+void obj_parser_set_extra(yyscan_t scanner, void *extra);
 
 __END_DECLS
 

Modified: brlcad/trunk/src/libgcv/wfobj/obj_rules.re
===================================================================
--- brlcad/trunk/src/libgcv/wfobj/obj_rules.re	2011-08-24 21:11:43 UTC (rev 46381)
+++ brlcad/trunk/src/libgcv/wfobj/obj_rules.re	2011-08-24 21:13:48 UTC (rev 46382)
@@ -39,19 +39,6 @@
 #undef F_BUFSIZE
 #define F_BUFSIZE 2048
 
-#if NO_POSIX_READ
-#define YY_INPUT(buf, result, max_size) \
-errno=0; \
-while ((result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) { \
-    if (errno != EINTR) { \
-	YY_FATAL_ERROR("input in flex scanner failed"); \
-	break; \
-    } \
-    errno=0; \
-    clearerr(yyin); \
-}
-#endif
-
 namespace arl {
 namespace obj_parser {
 namespace detail {
@@ -81,7 +68,7 @@
     return scanner->extra;
 }
 
-void *obj_parser_set_extra(yyscan_t scanner, void *extra)
+void obj_parser_set_extra(yyscan_t scanner, void *extra)
 {
     scanner->extra = extra;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.