[Emc-commit] rcslib/src/print rcs_prnt.cc,4.43.2.3,4.43.2.4

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/emc/rcslib/src/print
In directory sc8-pr-cvs1:/tmp/cvs-serv3769/src/print

Modified Files:
      Tag: wps_multiplat_dev_branch
	rcs_prnt.cc 
Log Message:
.

Index: rcs_prnt.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/rcs_prnt.cc,v
retrieving revision 4.43.2.3
retrieving revision 4.43.2.4
diff -C2 -d -r4.43.2.3 -r4.43.2.4
*** rcs_prnt.cc	21 Aug 2003 20:24:15 -0000	4.43.2.3
--- rcs_prnt.cc	22 Aug 2003 20:06:37 -0000	4.43.2.4
***************
*** 11,22 ****

  #ifndef _TIMER_H
! extern "C" double RCS_EXPORT etime (void);
  #endif

! RCS_LINKED_LIST RCS_FAR *rcs_print_list = NULL;
! char RCS_FAR **rcs_lines_table = NULL;
  #if 0
! void (RCS_PASCAL RCS_FAR * rcs_print_notify) () = NULL;
  #endif

--- 11,40 ----

+ #ifdef DEBUG_MEMORY
+ #include "dbg_mem.h"
+ #else
+ #ifndef DEBUG_MALLOC
+ #define DEBUG_MALLOC malloc
+ #endif
+ #ifndef DEBUG_CALLOC
+ #define DEBUG_CALLOC calloc
+ #endif
+ #ifndef DEBUG_REALLOC
+ #define DEBUG_REALLOC realloc
+ #endif
+ #ifndef DEBUG_FREE
+ #define DEBUG_FREE free
+ #endif
+ #endif
+ // DEBUG_MEMORY
+ 
  #ifndef _TIMER_H
! extern "C" double etime (void);
  #endif

! RCS_LINKED_LIST *rcs_print_list = NULL;
! char **rcs_lines_table = NULL;
  #if 0
! void (RCS_PASCAL * rcs_print_notify) () = NULL;
  #endif

***************
*** 51,55 ****

! void RCS_EXPORT
  set_rcs_print_destination (RCS_PRINT_DESTINATION_TYPE _dest)
  {
--- 69,73 ----

! void
  set_rcs_print_destination (RCS_PRINT_DESTINATION_TYPE _dest)
  {
***************
*** 61,65 ****
  }

! RCS_PRINT_DESTINATION_TYPE RCS_EXPORT
  get_rcs_print_destination ()
  {
--- 79,83 ----
  }

! RCS_PRINT_DESTINATION_TYPE
  get_rcs_print_destination ()
  {
***************
*** 68,75 ****

  #ifdef USING_DECLSPEC
! RCS_EXPORT char RCS_FAR **
  get_rcs_lines_table ()
  #else
! char RCS_FAR **RCS_EXPORT
  get_rcs_lines_table ()
  #endif
--- 86,93 ----

  #ifdef USING_DECLSPEC
! char **
  get_rcs_lines_table ()
  #else
! char **RCS_EXPORT
  get_rcs_lines_table ()
  #endif
***************
*** 79,86 ****

  #ifdef USING_DECLSPEC
! RCS_EXPORT RCS_LINKED_LIST RCS_FAR *
  get_rcs_print_list ()
  #else
! RCS_LINKED_LIST RCS_FAR *RCS_EXPORT
  get_rcs_print_list ()
  #endif
--- 97,104 ----

  #ifdef USING_DECLSPEC
! RCS_LINKED_LIST *
  get_rcs_print_list ()
  #else
! RCS_LINKED_LIST *RCS_EXPORT
  get_rcs_print_list ()
  #endif
***************
*** 89,93 ****
  }

! int RCS_EXPORT
  get_rcs_print_list_size ()
  {
--- 107,111 ----
  }

! int
  get_rcs_print_list_size ()
  {
***************
*** 101,105 ****
      }
  }
! void RCS_EXPORT
  set_rcs_print_list_sizing (int _new_max_size,
  			   LIST_SIZING_MODE _new_sizing_mode)
--- 119,123 ----
      }
  }
! void
  set_rcs_print_list_sizing (int _new_max_size,
  			   LIST_SIZING_MODE _new_sizing_mode)
***************
*** 117,121 ****
  #if 0

! void RCS_EXPORT
  set_rcs_print_notify (RCS_PRINT_NOTIFY_FUNC_PTR _rcs_print_notify)
  {
--- 135,139 ----
  #if 0

! void
  set_rcs_print_notify (RCS_PRINT_NOTIFY_FUNC_PTR _rcs_print_notify)
  {
***************
*** 124,128 ****
  #endif

! void RCS_EXPORT
  clean_print_list ()
  {
--- 142,146 ----
  #endif

! void
  clean_print_list ()
  {
***************
*** 134,139 ****
  }

! void RCS_EXPORT
! output_print_list (int output_func (char RCS_FAR *))
  {
    if (NULL != rcs_print_list)
--- 152,157 ----
  }

! void
! output_print_list (int output_func (char *))
  {
    if (NULL != rcs_print_list)
***************
*** 152,156 ****
  }

! int RCS_EXPORT
  count_characters_in_print_list ()
  {
--- 170,174 ----
  }

! int
  count_characters_in_print_list ()
  {
***************
*** 169,173 ****
  }

! int RCS_EXPORT
  count_lines_in_print_list ()
  {
--- 187,191 ----
  }

! int
  count_lines_in_print_list ()
  {
***************
*** 192,196 ****
  }

! void RCS_EXPORT
  convert_print_list_to_lines ()
  {
--- 210,214 ----
  }

! void
  convert_print_list_to_lines ()
  {
***************
*** 270,274 ****
  }

! void RCS_EXPORT
  update_lines_table ()
  {
--- 288,292 ----
  }

! void
  update_lines_table ()
  {
***************
*** 281,285 ****
      {
        convert_print_list_to_lines ();
!       rcs_lines_table = (char RCS_FAR **) DEBUG_MALLOC (sizeof (char *)
  							*
  							rcs_print_list->
--- 299,303 ----
      {
        convert_print_list_to_lines ();
!       rcs_lines_table = (char **) DEBUG_MALLOC (sizeof (char *)
  							*
  							rcs_print_list->
***************
*** 301,309 ****

  #ifdef USING_DECLSPEC
! RCS_EXPORT char RCS_FAR *
! strip_control_characters (char RCS_FAR * _dest, char RCS_FAR * _src)
  #else
! char RCS_FAR *RCS_EXPORT
! strip_control_characters (char RCS_FAR * _dest, char RCS_FAR * _src)
  #endif
  {
--- 319,327 ----

  #ifdef USING_DECLSPEC
! char *
! strip_control_characters (char * _dest, char * _src)
  #else
! char *RCS_EXPORT
! strip_control_characters (char * _dest, char * _src)
  #endif
  {
***************
*** 354,358 ****

! void RCS_EXPORT
  bad_char_to_print (char *ptr)
  {
--- 372,376 ----

! void
  bad_char_to_print (char *ptr)
  {
***************
*** 363,368 ****
  }

! int RCS_EXPORT
! rcs_vprint (char RCS_FAR * _fmt, va_list _args, int save_string)
  {
    static char temp_string[4096];
--- 381,386 ----
  }

! int
! rcs_vprint (char * _fmt, va_list _args, int save_string)
  {
    static char temp_string[4096];
***************
*** 431,436 ****
  }

! int RCS_EXPORT
! rcs_puts (char RCS_FAR * _str)
  {
    int retval, retval2;
--- 449,454 ----
  }

! int
! rcs_puts (char * _str)
  {
    int retval, retval2;
***************
*** 451,456 ****
  }

! int RCS_EXPORT
! rcs_fputs (char RCS_FAR * _str)
  {
    int retval = EOF;
--- 469,474 ----
  }

! int
! rcs_fputs (char * _str)
  {
    int retval = EOF;
***************
*** 583,587 ****
  }

! void RCS_EXPORT
  close_rcs_printing ()
  {
--- 601,605 ----
  }

! void
  close_rcs_printing ()
  {
***************
*** 605,610 ****
  }

! int RCS_EXPORT
! set_rcs_print_file (char RCS_FAR * _file_name)
  {
    if (_file_name == NULL)
--- 623,628 ----
  }

! int
! set_rcs_print_file (char * _file_name)
  {
    if (_file_name == NULL)
***************
*** 629,634 ****
  }

! int RCS_EXPORT
! rcs_print (char RCS_FAR * _fmt, ...)
  {
    static char temp_buffer[1024];
--- 647,652 ----
  }

! int
! rcs_print (char * _fmt, ...)
  {
    static char temp_buffer[1024];
***************
*** 672,676 ****
  static const char *rcs_error_filename = NULL;
  static int rcs_error_linenum = -1;
! int RCS_EXPORT
  set_print_rcs_error_info (const char *file, int line)
  {
--- 690,694 ----
  static const char *rcs_error_filename = NULL;
  static int rcs_error_linenum = -1;
! int
  set_print_rcs_error_info (const char *file, int line)
  {
***************
*** 681,686 ****

! int RCS_EXPORT
! print_rcs_error_new (char RCS_FAR * _fmt, ...)
  {
    int retval = 0;
--- 699,704 ----

! int
! print_rcs_error_new (char * _fmt, ...)
  {
    int retval = 0;
***************
*** 725,729 ****
  static const char *rcs_debug_filename = NULL;
  static int rcs_debug_linenum = -1;
! int RCS_EXPORT
  set_print_rcs_debug_info (const char *file, int line)
  {
--- 743,747 ----
  static const char *rcs_debug_filename = NULL;
  static int rcs_debug_linenum = -1;
! int
  set_print_rcs_debug_info (const char *file, int line)
  {
***************
*** 734,739 ****

! int RCS_EXPORT
! print_rcs_debug_new (long flag_to_check, char RCS_FAR * _fmt, ...)
  {
    int retval = 0;
--- 752,757 ----

! int
! print_rcs_debug_new (long flag_to_check, char * _fmt, ...)
  {
    int retval = 0;
***************
*** 763,768 ****
  #endif

! int RCS_EXPORT
! rcs_print_debug (long flag_to_check, char RCS_FAR * _fmt, ...)
  {
    int retval = 0;
--- 781,786 ----
  #endif

! int
! rcs_print_debug (long flag_to_check, char * _fmt, ...)
  {
    int retval = 0;
***************
*** 789,793 ****
  }

! void RCS_EXPORT
  set_rcs_print_flag (unsigned long flag_to_set)
  {
--- 807,811 ----
  }

! void
  set_rcs_print_flag (unsigned long flag_to_set)
  {
***************
*** 800,804 ****
  }

! void RCS_EXPORT
  clear_rcs_print_flag (unsigned long flag_to_clear)
  {
--- 818,822 ----
  }

! void
  clear_rcs_print_flag (unsigned long flag_to_clear)
  {
***************
*** 813,818 ****

! int RCS_EXPORT
! rcs_print_sys_error (int error_source, char RCS_FAR * _fmt, ...)
  {
    static char temp_string[256];
--- 831,836 ----

! int
! rcs_print_sys_error (int error_source, char * _fmt, ...)
  {
    static char temp_string[256];
***************
*** 915,923 ****
  extern "C"
  {
!   int RCS_EXPORT rcs_print_error (char RCS_FAR * _fmt, ...);
  }

! int RCS_EXPORT
! rcs_print_error (char RCS_FAR * _fmt, ...)
  {
    int retval = 0;
--- 933,941 ----
  extern "C"
  {
!   int rcs_print_error (char * _fmt, ...);
  }

! int
! rcs_print_error (char * _fmt, ...)
  {
    int retval = 0;