Changeset fc2f76 in git

Timestamp:

Jan 8, 2014, 3:17:18 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f4b7ce8c38ff75c8fd45c72d96102b0ea850a8d7

Parents:

7f21fbb79feef6519454a0a98aa7a2ba88e2150d

Message:

fix: removed feGetOptValue (->feOptValue)

Location:

Singular

Files:

• cntrlc.cc (modified) (2 diffs)
• feOpt.cc (modified) (1 diff)
• feOpt.h (modified) (1 diff)

Singular/cntrlc.cc

@@ -350 +350 @@
       fprintf(stderr,"// ** Interrupt at cmd:`%s` in line:'%s'\n",
         Tok2Cmdname(iiOp),my_yylinebuf);
-      if (feGetOptValue(FE_OPT_EMACS) == NULL)
+      if (feOptValue(FE_OPT_EMACS) == NULL)
       {
         fputs("abort after this command(a), abort immediately(r), print backtrace(b), continue(c) or quit Singular(q) ?",stderr);fflush(stderr);
@@ -385 +385 @@
                 siCntrlc++;
       case 'c':
-                if ((feGetOptValue(FE_OPT_EMACS) == NULL) && (default_opt!=' '))
+                if ((feOptValue(FE_OPT_EMACS) == NULL) && (default_opt!=' '))
                 {
                   /* Read until a newline or EOF */

Singular/feOpt.cc

@@ -128 +128 @@
   }
   return FE_OPT_UNDEF;
-}
-
-void* feGetOptValue(feOptIndex opt)
-{
-  return feOptSpec[(int)opt].value;
 }
 

Singular/feOpt.h

@@ -35 +35 @@
 void feOptHelp(const char* name);
 
-void* feGetOptValue(feOptIndex opt);
-
-
 #ifdef __cplusplus
 
-inline void* feOptValue(feOptIndex opt)
+static inline void* feOptValue(feOptIndex opt)
 {
   return feOptSpec[(int)opt].value;