Changeset eb0a5bc in git for Singular/fehelp.cc

Timestamp:

May 2, 2005, 6:31:56 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

ab54a0fdd81251ac22552c9f061e33255615bcff

Parents:

47ec284c095176a99fb82c1ee239e162d30b658c

Message:

*hannes: code cleanup, LIB, LIB(), load use identical routines


git-svn-id: file:///usr/local/Singular/svn/trunk@8003 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/fehelp.cc (modified) (9 diffs)

Singular/fehelp.cc

@@ -4 +4 @@
 /*
 * ABSTRACT: help system
-* versin $Id: fehelp.cc,v 1.40 2005-04-22 15:14:02 Singular Exp $
+* versin $Id: fehelp.cc,v 1.41 2005-05-02 16:31:55 Singular Exp $
 */
 
@@ -233 +233 @@
 #ifdef ix86_Win
     // for the 6(!) default browsers
-    heHelpBrowsers=(heBrowser_s*)omAlloc0(5*sizeof(heBrowser_s));
+    heHelpBrowsers=(heBrowser_s*)omAlloc0(6*sizeof(heBrowser_s));
 #else
     // for the 4(!) default browsers
@@ -642 +642 @@
 static BOOLEAN heOnlineHelp(char* s)
 {
-#ifdef HAVE_NAMESPACES
-  idhdl h, ns;
-  iiname2hdl(s, &ns, &h);
-#else /* HAVE_NAMESPACES */
 #ifdef HAVE_NS
   idhdl h=IDROOT->get(s,myynest);
@@ -651 +647 @@
   idhdl h=idroot->get(s,myynest);
 #endif /* HAVE_NS */
-#endif /* HAVE_NAMESPACES */
 
   // try help for a procedure
@@ -701 +696 @@
 
     yylpin = fp;
-#ifdef HAVE_NAMESPACES
-    yylplex(str, libnamebuf, &lib_style, IDROOT, FALSE, GET_INFO);
-#else /* HAVE_NAMESPACES */
 #ifdef HAVE_NS
     yylplex(str, libnamebuf, &lib_style, IDROOT, FALSE, GET_INFO);
@@ -709 +701 @@
     yylplex(str, libnamebuf, &lib_style, GET_INFO);
 #endif /* HAVE_NS */
-#endif /* HAVE_NAMESPACES */
     reinit_yylp();
     if(lib_style == OLD_LIBSTYLE)
@@ -755 +746 @@
 {
   if (key == NULL || *key == '\0') return 0;
-#ifdef HAVE_NAMESPACES
-  idhdl h, ns;
-  iiname2hdl(key, &ns, &h);
-#else /* HAVE_NAMESPACES */
 #ifdef HAVE_NS
   idhdl h=IDROOT->get(key,myynest);
@@ -764 +751 @@
   idhdl h=idroot->get(key,myynest);
 #endif /* HAVE_NS */
-#endif /* HAVE_NAMESPACES */
   if ((h!=NULL) && (IDTYP(h)==PROC_CMD))
   {
@@ -947 +933 @@
                      char *pp=strchr(sys,'#');
                      if (pp!=NULL)
-                     { 
-                       *pp='\0';
+                     {
+                       *pp='\0';
                        i=strlen(sys);
-                       memset(pp,0,MAX_SYSCMD_LEN-i);
-                     }  
+                       memset(pp,0,MAX_SYSCMD_LEN-i);
+                     }
                    }
                    i=strlen(sys);