OpenXM/src/kxx/sm1stackmachine.c - diff

Return to sm1stackmachine.c CVS log

Up to [local] / OpenXM / src / kxx

Diff for /OpenXM/src/kxx/sm1stackmachine.c between version 1.4 and 1.6

-version 1.4, 2005/06/16 05:07:24
+version 1.6, 2006/02/01 00:30:05
 Line 3
 Line 3
 Line 3
  #include "ox_kan.h"
  #include "serversm.h"
  extern int OXprintMessage;
+ extern char *MsgStackTrace;
+ extern char *MsgSourceTrace;
+ extern struct object *MsgStackTraceInArrayp;
  /*  server stack machine */
-Line 138  int Sm1_popCMO(ox_stream fp,int serial)
+Line 141  int Sm1_popCMO(ox_stream fp,int serial)
 Line 138  int Sm1_popCMO(ox_stream fp,int serial)
 Line 141  int Sm1_popCMO(ox_stream fp,int serial)
  int Sm1_pushError2(int serial, int no, char *s)
  {
    struct object ob = OINIT;
-   ob = KnewErrorPacket(serial,no,s);
+   struct object core = OINIT;
+   struct object core1 = OINIT;
+   char *ss;
+   char *error_message="<ox103:error_message>";
+   char *message="<ox103:message>";
+   char *stack_trace="<ox103:stack_trace>";
+   char *source_trace="<ox103:source_trace>";
+   char *error_message2="</ox103:error_message>";
+   char *message2="</ox103:message>";
+   char *stack_trace2="</ox103:stack_trace>";
+   char *source_trace2="</ox103:source_trace>";
+   ss = (char *) sGC_malloc(strlen(s)+strlen(MsgStackTrace)+
+                            strlen(MsgSourceTrace)+
+                            strlen(error_message)+strlen(error_message2)+
+                            strlen(message)+strlen(message2)+
+                            strlen(stack_trace)+strlen(stack_trace2)+
+                            strlen(source_trace)+strlen(source_trace2)+2);
+   strcat(ss,error_message);
+   strcat(ss,message);
+   strcat(ss,s);
+   strcat(ss,message2);
+   if (MsgStackTrace != NULL) {
+         strcat(ss,stack_trace);
+         strcat(ss,MsgStackTrace);
+         strcat(ss,stack_trace2);
+   }
+   if (MsgSourceTrace != NULL) {
+         strcat(ss,source_trace);
+         strcat(ss,MsgSourceTrace);
+         strcat(ss,source_trace2);
+   }
+   strcat(ss,error_message2);
+   if (MsgStackTraceInArrayp != NULL) {
+         core = KSnewObjectArray(2);
+         core1 = KSnewObjectArray(2);
+         putoa(core1,0,KpoString("where"));  /* keyword */
+         putoa(core1,1,(*MsgStackTraceInArrayp));
+     putoa(core,0,core1);
+     core1 = KSnewObjectArray(2);
+         putoa(core1,0,KpoString("reason_of_error")); /* keyword */
+         putoa(core1,1,KpoString(s));
+         putoa(core,1,core1);
+   }else{
+         core = KSnewObjectArray(0);
+   }
+   ob = KSnewObjectArray(4);
+   putoa(ob,0,KpoInteger(serial)); putoa(ob,1,KpoInteger(no));
+   putoa(ob,2,KpoString(ss));
+   putoa(ob,3,core);
+   ob = KnewErrorPacketObj(ob);
    KSpush(ob);
  }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>