cvs commit: apache-1.3/src/os/os2 os.c

[bjh]

bjh         99/11/27 06:52:36

  Modified:    src/os/os2 os.c
  Log:
  Add an important piece of information to the error message when a module
  fails to load, the name of the dll that caused the problem. This can be
  different from the module dll if it depends on another dll and that
  other dll can't be found.
  
  Revision  Changes    Path
  1.4       +6 -2      apache-1.3/src/os/os2/os.c
  
  Index: os.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/os2/os.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- os.c      1999/05/07 05:49:46     1.3
  +++ os.c      1999/11/27 14:52:35     1.4
  @@ -9,6 +9,7 @@
   #include <stdio.h>
   
   static int rc=0;
  +static char errorstr[20];
   
   void ap_os_dso_init(void)
   {
  @@ -18,7 +19,6 @@
   
   ap_os_dso_handle_t ap_os_dso_load(const char *module_name)
   {
  -    char errorstr[200];
       HMODULE handle;
   
       rc = DosLoadModule(errorstr, sizeof(errorstr), module_name, &handle);
  @@ -54,5 +54,9 @@
   
   const char *ap_os_dso_error(void)
   {
  -    return ap_os_error_message(rc);
  +    static char message[200];
  +    strcpy(message, ap_os_error_message(rc));
  +    strcat(message, " for module ");
  +    strcat(message, errorstr);
  +    return message;
   }