Menu
▾
▴
[Emc-commit] rcslib/src/print Makefile,4.33.2.2,4.33.2.3 rcs_prnt.cc,4.43.2.2,4.43.2.3 rcs_prnt.hh,4.38.2.1,4.38.2.2
|
From: <wsh...@us...> - 2003-08-22 03:55:46
|
Update of /cvsroot/emc/rcslib/src/print
In directory sc8-pr-cvs1:/tmp/cvs-serv11714/src/print
Modified Files:
Tag: wps_multiplat_dev_branch
Makefile rcs_prnt.cc rcs_prnt.hh
Log Message:
.
Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/Makefile,v
retrieving revision 4.33.2.2
retrieving revision 4.33.2.3
diff -C2 -d -r4.33.2.2 -r4.33.2.3
*** Makefile 8 Aug 2003 15:08:50 -0000 4.33.2.2
--- Makefile 21 Aug 2003 20:24:15 -0000 4.33.2.3
***************
*** 8,12 ****
clean distclean check distcheck install:
! ../../etc/multiplatbuild.sh config $@
.PHONY: all config clean distclean check distcheck install
--- 8,12 ----
clean distclean check distcheck install:
! ../../etc/multiplatbuild.sh $@
.PHONY: all config clean distclean check distcheck install
Index: rcs_prnt.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/rcs_prnt.cc,v
retrieving revision 4.43.2.2
retrieving revision 4.43.2.3
diff -C2 -d -r4.43.2.2 -r4.43.2.3
*** rcs_prnt.cc 18 Aug 2003 23:19:52 -0000 4.43.2.2
--- rcs_prnt.cc 21 Aug 2003 20:24:15 -0000 4.43.2.3
***************
*** 1,56 ****
- #include "rcs_defs.hh" /* _Windows, RCS_FAR, EXTERN_C_STD_HEADERS */
-
- #ifdef DEBUG_MEMORY
- #include "dbg_mem.h" // DEBUG_MALLOC, DEBUG_FREE
- #else
- #define DEBUG_MALLOC(x) malloc(x)
- #define DEBUG_FREE(x) free(x)
- #endif
-
- #ifdef EXTERN_C_STD_HEADERS
- extern "C"
- {
- #endif
-
- #ifdef VXWORKS
- #include "vxWorks.h"
- #endif
-
-
- #ifdef USING_VARARGS
- #include <varargs.h> /* va_list, va_start(), va_end() */
- #else
- #include <stdarg.h> /* va_list, va_start(), va_end() */
- #endif
-
- #ifndef NO_STDIO
- #include <stdio.h> /* __printf()'s */
- #endif
-
- #include <string.h> /* strchr(), memmove() */
- #include <stdlib.h> /* malloc(), free(), realloc() */
- #include <errno.h> // errno()
- #ifdef VXWORKS
- #include <logLib.h> /* logMsg() */
- #endif
- #ifdef VXWORKS
- #include <taskLib.h> /* taskIdSelf() */
#else
! #include <sys/types.h>
! #ifdef UNIX_LIKE_PLAT
! #include <unistd.h> /* getpid() */
! #endif
! #endif
!
! #include <ctype.h>
!
! #ifdef EXTERN_C_STD_HEADERS
! }
! #endif
!
! #ifdef _Windows
! #include <windows.h> /* MessageBox() */
#endif
--- 1,8 ----
+ #if HAVE_CONFIG_H
+ #include "rcs_config_include.h"
#else
! #include "rcs_prnt_no_config.h"
#endif
***************
*** 65,69 ****
--- 17,24 ----
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
+
#if !defined(_Windows) || defined(WIN32)
RCS_PRINT_DESTINATION_TYPE rcs_print_destination = RCS_PRINT_TO_STDOUT;
***************
*** 159,162 ****
--- 114,120 ----
}
}
+
+ #if 0
+
void RCS_EXPORT
set_rcs_print_notify (RCS_PRINT_NOTIFY_FUNC_PTR _rcs_print_notify)
***************
*** 164,167 ****
--- 122,126 ----
rcs_print_notify = _rcs_print_notify;
}
+ #endif
void RCS_EXPORT
***************
*** 614,621 ****
--- 573,582 ----
break;
}
+ #if 0
if (NULL != rcs_print_notify)
{
(*rcs_print_notify) ();
}
+ #endif
}
return (retval);
Index: rcs_prnt.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/rcs_prnt.hh,v
retrieving revision 4.38.2.1
retrieving revision 4.38.2.2
diff -C2 -d -r4.38.2.1 -r4.38.2.2
*** rcs_prnt.hh 8 Aug 2003 14:21:14 -0000 4.38.2.1
--- rcs_prnt.hh 21 Aug 2003 20:24:15 -0000 4.38.2.2
***************
*** 14,53 ****
#define set_rcs_print_file(x)
- #ifdef EXTERN_C_STD_HEADERS
extern "C"
{
- #endif
-
extern int separate_words (char ** _dest, int _max,
char * _src);
-
- #if defined(__CPLUSPLUS__) || defined(__cplusplus)
}
- #endif
#else
!
! #include "rcs_defs.hh" /* _Windows, RCS_FAR, EXTERN_C_STD_HEADERS */
!
! #ifdef EXTERN_C_STD_HEADERS
! extern "C"
! {
! #endif
!
! #ifdef VXWORKS
! #include "vxWorks.h"
! #endif
!
!
! #ifdef USING_VARARGS
! #include <varargs.h> /* va_list */
! #else
! #include <stdarg.h> /* va_list */
! #endif
!
! #ifdef EXTERN_C_STD_HEADERS
! }
! #endif
!
#if defined(__CPLUSPLUS__) || defined(__cplusplus)
--- 14,25 ----
#define set_rcs_print_file(x)
extern "C"
{
extern int separate_words (char ** _dest, int _max,
char * _src);
}
#else
! // ifdef DISABLE_RCS_PRINT
#if defined(__CPLUSPLUS__) || defined(__cplusplus)
***************
*** 55,63 ****
#ifdef USING_DECLSPEC
! extern RCS_EXPORT RCS_LINKED_LIST RCS_FAR *get_rcs_print_list ();
#else
! extern RCS_LINKED_LIST RCS_FAR *RCS_EXPORT get_rcs_print_list ();
#endif
! extern void RCS_EXPORT set_rcs_print_list_sizing_mode (int, LIST_SIZING_MODE);
#endif
--- 27,35 ----
#ifdef USING_DECLSPEC
! extern RCS_LINKED_LIST *get_rcs_print_list ();
#else
! extern RCS_LINKED_LIST * get_rcs_print_list ();
#endif
! extern void set_rcs_print_list_sizing_mode (int, LIST_SIZING_MODE);
#endif
***************
*** 67,94 ****
#endif
! extern void RCS_EXPORT clean_print_list (void);
! extern void RCS_EXPORT output_print_list (int output_func (char *));
! extern int RCS_EXPORT count_characters_in_print_list (void);
! extern int RCS_EXPORT count_lines_in_print_list (void);
! extern void RCS_EXPORT convert_print_list_to_lines (void);
! extern void RCS_EXPORT update_lines_table (void);
! extern int RCS_EXPORT rcs_vprint (char RCS_FAR * _fmt, va_list va_args,
int save_string);
! extern int RCS_EXPORT rcs_print (char RCS_FAR * _fmt, ...);
! extern int RCS_EXPORT rcs_print_debug (long, char RCS_FAR * _fmt, ...);
#ifdef DO_NOT_USE_RCS_PRINT_ERROR_NEW
! extern int RCS_EXPORT rcs_print_error (char RCS_FAR * _fmt, ...);
#else
! extern int RCS_EXPORT set_print_rcs_error_info (const char *file, int line);
! extern int RCS_EXPORT print_rcs_error_new (char RCS_FAR * _fmt, ...);
#define rcs_print_error set_print_rcs_error_info( __FILE__, __LINE__); print_rcs_error_new
#endif
#ifdef DO_NOT_USE_RCS_PRINT_DEBUG_NEW
! extern int RCS_EXPORT rcs_print_debug (char RCS_FAR * _fmt, ...);
#else
! extern int RCS_EXPORT set_print_rcs_debug_info (const char *file, int line);
! extern int RCS_EXPORT print_rcs_debug_new (long flags_to_check,
! char RCS_FAR * _fmt, ...);
extern unsigned long rcs_print_mode_flags;
extern int rcs_debugging_enabled;
--- 39,68 ----
#endif
! extern void clean_print_list (void);
! extern void output_print_list (int output_func (char *));
! extern int count_characters_in_print_list (void);
! extern int count_lines_in_print_list (void);
! extern void convert_print_list_to_lines (void);
! extern void update_lines_table (void);
! #if 0
! extern int rcs_vprint (char * _fmt, va_list va_args,
int save_string);
! #endif
! extern int rcs_print (char * _fmt, ...);
! extern int rcs_print_debug (long, char * _fmt, ...);
#ifdef DO_NOT_USE_RCS_PRINT_ERROR_NEW
! extern int rcs_print_error (char * _fmt, ...);
#else
! extern int set_print_rcs_error_info (const char *file, int line);
! extern int print_rcs_error_new (char * _fmt, ...);
#define rcs_print_error set_print_rcs_error_info( __FILE__, __LINE__); print_rcs_error_new
#endif
#ifdef DO_NOT_USE_RCS_PRINT_DEBUG_NEW
! extern int rcs_print_debug (char * _fmt, ...);
#else
! extern int set_print_rcs_debug_info (const char *file, int line);
! extern int print_rcs_debug_new (long flags_to_check,
! char * _fmt, ...);
extern unsigned long rcs_print_mode_flags;
extern int rcs_debugging_enabled;
***************
*** 98,133 ****
! extern void RCS_EXPORT set_rcs_print_flag (unsigned long flags_to_set);
! extern void RCS_EXPORT clear_rcs_print_flag (unsigned long flags_to_set);
#ifdef USING_DECLSPEC
! extern RCS_EXPORT char RCS_FAR *strip_control_characters (char RCS_FAR *
_dest,
! char RCS_FAR *
_src);
#else
! extern char RCS_FAR *RCS_EXPORT strip_control_characters (char RCS_FAR *
_dest,
! char RCS_FAR *
_src);
#endif
! extern int RCS_EXPORT separate_words (char RCS_FAR ** _dest, int _max,
! char RCS_FAR * _src);
! extern int RCS_EXPORT rcs_puts (char RCS_FAR *);
! extern int RCS_EXPORT rcs_fputs (char RCS_FAR *);
#ifdef USING_DECLSPEC
! extern RCS_EXPORT char RCS_FAR **get_rcs_lines_table (void);
#else
! extern char RCS_FAR **RCS_EXPORT get_rcs_lines_table (void);
#endif
! extern int RCS_EXPORT get_rcs_print_list_size (void);
! typedef void (RCS_PASCAL RCS_FAR * RCS_PRINT_NOTIFY_FUNC_PTR) (void);
! extern void RCS_EXPORT set_rcs_print_notify (RCS_PRINT_NOTIFY_FUNC_PTR);
! extern int RCS_EXPORT set_rcs_print_file (char RCS_FAR * _file_name);
! extern void RCS_EXPORT close_rcs_printing (void);
#if defined(__CPLUSPLUS__) || defined(__cplusplus)
--- 72,109 ----
! extern void set_rcs_print_flag (unsigned long flags_to_set);
! extern void clear_rcs_print_flag (unsigned long flags_to_set);
#ifdef USING_DECLSPEC
! extern char *strip_control_characters (char *
_dest,
! char *
_src);
#else
! extern char * strip_control_characters (char *
_dest,
! char *
_src);
#endif
! extern int separate_words (char ** _dest, int _max,
! char * _src);
! extern int rcs_puts (char *);
! extern int rcs_fputs (char *);
#ifdef USING_DECLSPEC
! extern char **get_rcs_lines_table (void);
#else
! extern char ** get_rcs_lines_table (void);
#endif
! extern int get_rcs_print_list_size (void);
! #if 0
! typedef void (RCS_PASCAL * RCS_PRINT_NOTIFY_FUNC_PTR) (void);
! extern void set_rcs_print_notify (RCS_PRINT_NOTIFY_FUNC_PTR);
! #endif
! extern int set_rcs_print_file (char * _file_name);
! extern void close_rcs_printing (void);
#if defined(__CPLUSPLUS__) || defined(__cplusplus)
***************
*** 200,210 ****
#endif
! extern void RCS_EXPORT
set_rcs_print_destination (RCS_PRINT_DESTINATION_TYPE);
! extern RCS_PRINT_DESTINATION_TYPE RCS_EXPORT
get_rcs_print_destination (void);
! extern int RCS_EXPORT rcs_print_sys_error (int error_source,
! char RCS_FAR * _fmt, ...);
#if defined(__CPLUSPLUS__) || defined(__cplusplus)
--- 176,186 ----
#endif
! extern void
set_rcs_print_destination (RCS_PRINT_DESTINATION_TYPE);
! extern RCS_PRINT_DESTINATION_TYPE
get_rcs_print_destination (void);
! extern int rcs_print_sys_error (int error_source,
! char * _fmt, ...);
#if defined(__CPLUSPLUS__) || defined(__cplusplus)
|
