Changeset 104 for trunk/mediafolder/c/helper

Timestamp:

Oct 2, 2023, 11:34:35 PM (23 months ago)

Author:

gyoung

Message:

Remaining changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• mediafolder/c/helper/cddbhelper.cpp (modified) (3 diffs)
• mediafolder/c/helper/except.cpp (modified) (8 diffs)
• mediafolder/c/helper/makefile (modified) (1 diff)

trunk/mediafolder/c/helper/cddbhelper.cpp

@@ -38 +38 @@
  */
 
-void extern printError(char* errorString)
+void printError(char* errorString)
 {
     char buffer[CCHMAXPATH] = {0};
@@ -55 +55 @@
 }
 
-void extern printErrorCR(char* errorString)
+void printErrorCR(char* errorString)
 {
   fprintf(stderr,"%s\n",errorString);
@@ -63 +63 @@
 
 
-void extern printData(char* outString)
+void printData(char* outString)
 {
   int fileHandle;
   int rc;
 
-  /* The name cddbDataFile is defined in the main pmcddb.cpp file. It is 
+  /* The name cddbDataFile is defined in the main pmcddb.cpp file. It is
      the discid (this is the native format of the data hold by a cddb server) */
   fileHandle=open(cddbDataFile,O_APPEND|O_TEXT|O_WRONLY|O_CREAT,S_IWRITE);

trunk/mediafolder/c/helper/except.cpp

@@ -455 +455 @@
 {
   ULONG rc = XCPT_CONTINUE_SEARCH;
-  
+
   if (pERepRec->fHandlerFlags & EH_EXIT_UNWIND)
     return (XCPT_CONTINUE_SEARCH);
@@ -495 +495 @@
 {
   ULONG rc = XCPT_CONTINUE_SEARCH;
-  
+
   if (pERepRec->fHandlerFlags & EH_EXIT_UNWIND)
     return (XCPT_CONTINUE_SEARCH);
@@ -502 +502 @@
   if (pERepRec->fHandlerFlags & EH_NESTED_CALL)
     return (XCPT_CONTINUE_SEARCH);
-  
+
   if ((pERepRec->ExceptionNum & XCPT_SEVERITY_CODE) == XCPT_FATAL_EXCEPTION)
     {
@@ -530 +530 @@
 
   return 'c';
-} 
+}
 
 ULONG APIENTRY HandleFatalException (PEXCEPTIONREPORTRECORD       pERepRec,
@@ -641 +641 @@
           }
 #endif
-        
+
         fAlreadyTrapped = TRUE;
         /* end  John Currier's recursion prevention */
@@ -1167 +1167 @@
 }
 
-#include <exe.h>
 #include <newexe.h>
 #define  FOR_EXEHDR  1  /* avoid define conflicts between newexe.h and exe386.h */
@@ -1820 +1819 @@
                do {
                   read(fh,(void *)&FirstLine,sizeof(FirstLine));
-   
+
                   if (FirstLine.LineNum!=0) {
                      fprintf(hTrap,"Missing Line table information\n");
@@ -1849 +1848 @@
                         }
                         break;
-   
+
                      case 1:
                         lseek(fh, sizeof(struct linlist_rec), SEEK_CUR);
                         break;
-   
+
                      case 2:
                         lseek(fh, sizeof(struct linsourcelist_rec), SEEK_CUR);
                         break;
-   
+
                      case 3:
                         lseek(fh, sizeof(struct filenam_rec), SEEK_CUR);
                         break;
-   
+
                      case 4:
                         lseek(fh, sizeof(struct pathtab_rec), SEEK_CUR);
                         break;
-   
+
                   }
                }

trunk/mediafolder/c/helper/makefile

@@ -4 +4 @@
 
 CC           = icc
-CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
-                  
+CPPFLAGS     = /Ge- /Gm+ /G4 /Gl- /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
+
 INC     =       ..\include
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 ODIR            = ./obj
 CPPDIR  = .