Changeset 36ee6f in git for omalloc/omRet2Info.c

Timestamp:

Sep 18, 2000, 11:12:17 AM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f3398d316400fe1ee1677fc397cacb80566ac664

Parents:

8b515ab548162a33468ee70ac2adb59e9c8d9b45

Message:

* more tests


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

File:

• omalloc/omRet2Info.c (modified) (4 diffs)

omalloc/omRet2Info.c

@@ -4 +4 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omRet2Info.c,v 1.6 2000-09-14 12:59:53 obachman Exp $
+ *  Version: $Id: omRet2Info.c,v 1.7 2000-09-18 09:12:16 obachman Exp $
  *******************************************************************/
 #include <stdio.h>
@@ -111 +111 @@
         else if (fmt[l] == 'F') fprintf(fd, "%-20s", (*info[i].func != '\0' ? info[i].func : "??"));
         else if (fmt[l] == 'l') fprintf(fd, "%d", info[i].line);
+        else if (fmt[l] == 'N') 
+        {
+          if (*info[i].func != '\0')
+          {
+            char* found = strchr(info[i].func, '(');
+            if (found) *found = '\0';
+            fprintf(fd, "%-20s", info[i].func);
+            if (found) *found = '(';
+          }
+          else
+            fprintf(fd, "%-20s", "??");
+        }
         else if (fmt[l] == 'L') 
         {
@@ -143 +155 @@
   i = omBackTrace_2_RetInfo(bt, info, max);
 #ifdef OM_PRINT_RETURN_ADDRESS
-  return omPrintRetInfo(info, i, fd, "  #%i at %L in %F ra=%p\n");
+  return omPrintRetInfo(info, i, fd, "  #%i at %L in %N ra=%p\n");
 #else
-  return omPrintRetInfo(info, i, fd, "  #%i at %L in %F\n");
+  return omPrintRetInfo(info, i, fd, "  #%i at %L in %N\n");
 #endif  
 }
@@ -241 +253 @@
 #endif /* ! OM_INTERNAL_DEBUG */
 #ifdef OM_PRINT_RETURN_ADDRESS
-    return omPrintRetInfo(info, i, fd, "\n  #%i at %L in %F ra=%p");
+    return omPrintRetInfo(info, i, fd, "\n  #%i at %L in %N ra=%p");
 #else
-    return omPrintRetInfo(info, i, fd, "\n  #%i at %L in %F");
+    return omPrintRetInfo(info, i, fd, "\n  #%i at %L in %N");
 #endif
 }