kopia lustrzana https://github.com/F5OEO/tstools
More playing with printing redirection.
--HG-- extra : convert_revision : svn%3Aeff31bef-be4a-0410-a8fe-e47997df2690/trunk%40121issue20
tibs
rodzic
cf83dcabe0
commit
b0023efd46
3
es.c
3
es.c
|
|
@ -41,6 +41,7 @@
|
|||
#include "pes_fns.h"
|
||||
#include "tswrite_fns.h"
|
||||
#include "es_fns.h"
|
||||
#include "printing_fns.h"
|
||||
|
||||
#define DEBUG 0
|
||||
|
||||
|
|
@ -867,7 +868,7 @@ extern int seek_ES(ES_p es,
|
|||
err = seek_file(es->input,where.infile);
|
||||
if (err)
|
||||
{
|
||||
fprintf(stderr,"### Error seeking within ES file\n");
|
||||
print_err("### Error seeking within ES file\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
9
misc.c
9
misc.c
|
|
@ -54,6 +54,7 @@
|
|||
#include "misc_fns.h"
|
||||
#include "es_fns.h"
|
||||
#include "pes_fns.h"
|
||||
#include "printing_fns.h"
|
||||
|
||||
#define DEBUG_SEEK 1
|
||||
|
||||
|
|
@ -297,14 +298,14 @@ extern int seek_file(int filedes,
|
|||
offset_t newposn = lseek(filedes,posn,SEEK_SET);
|
||||
if (newposn == -1)
|
||||
{
|
||||
fprintf(stderr,"### Error moving (seeking) to position " OFFSET_T_FORMAT
|
||||
" in file: %s\n",posn,strerror(errno));
|
||||
fprint_err("### Error moving (seeking) to position " OFFSET_T_FORMAT
|
||||
" in file: %s\n",posn,strerror(errno));
|
||||
return 1;
|
||||
}
|
||||
else if (newposn != posn)
|
||||
{
|
||||
fprintf(stderr,"### Error moving (seeking) to position " OFFSET_T_FORMAT
|
||||
" in file: actually moved to " OFFSET_T_FORMAT "\n",posn,newposn);
|
||||
fprint_err("### Error moving (seeking) to position " OFFSET_T_FORMAT
|
||||
" in file: actually moved to " OFFSET_T_FORMAT "\n",posn,newposn);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
|
|
|||
110
printing.c
110
printing.c
|
|
@ -33,24 +33,38 @@
|
|||
#include "compat.h"
|
||||
#include "printing_fns.h"
|
||||
|
||||
#define DEBUG 1
|
||||
|
||||
// ============================================================
|
||||
// Default printing functions
|
||||
// ============================================================
|
||||
|
||||
static void print_message_to_stdout(const char *message)
|
||||
{
|
||||
#if DEBUG
|
||||
fputs("1>>",stdout);
|
||||
#endif
|
||||
(void) fputs(message,stdout);
|
||||
}
|
||||
static void print_message_to_stderr(const char *message)
|
||||
{
|
||||
#if DEBUG
|
||||
fputs("2>>",stderr);
|
||||
#endif
|
||||
(void) fputs(message,stderr);
|
||||
}
|
||||
static void fprint_message_to_stdout(const char *format, va_list arg_ptr)
|
||||
{
|
||||
#if DEBUG
|
||||
fputs("3>>",stdout);
|
||||
#endif
|
||||
(void) vfprintf(stdout, format, arg_ptr);
|
||||
}
|
||||
static void fprint_message_to_stderr(const char *format, va_list arg_ptr)
|
||||
{
|
||||
#if DEBUG
|
||||
fputs("4>>",stderr);
|
||||
#endif
|
||||
(void) vfprintf(stderr, format, arg_ptr);
|
||||
}
|
||||
|
||||
|
|
@ -58,11 +72,30 @@ static void fprint_message_to_stderr(const char *format, va_list arg_ptr)
|
|||
// Print redirection
|
||||
// ============================================================
|
||||
|
||||
static void (*print_message_fn) (const char *message) = print_message_to_stdout;
|
||||
static void (*print_error_fn) (const char *message) = print_message_to_stdout;
|
||||
struct print_fns
|
||||
{
|
||||
void (*print_message_fn) (const char *message);
|
||||
void (*print_error_fn) (const char *message);
|
||||
|
||||
static void (*fprint_message_fn) (const char *format, va_list arg_ptr) = fprint_message_to_stdout;
|
||||
static void (*fprint_error_fn) (const char *format, va_list arg_ptr) = fprint_message_to_stdout;
|
||||
void (*fprint_message_fn) (const char *format, va_list arg_ptr);
|
||||
void (*fprint_error_fn) (const char *format, va_list arg_ptr);
|
||||
};
|
||||
|
||||
static struct print_fns fns = { print_message_to_stdout,
|
||||
print_message_to_stdout,
|
||||
fprint_message_to_stdout,
|
||||
fprint_message_to_stdout};
|
||||
|
||||
#if DEBUG
|
||||
static void report_fns(const char *why)
|
||||
{
|
||||
printf("Printing bound to (%s) m:%p, e:%p, fm:%p, fe:%p\n",why,
|
||||
fns.print_message_fn,
|
||||
fns.print_error_fn,
|
||||
fns.fprint_message_fn,
|
||||
fns.fprint_error_fn);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// ============================================================
|
||||
|
|
@ -73,7 +106,11 @@ static void (*fprint_error_fn) (const char *format, va_list arg_ptr) = fprint_
|
|||
*/
|
||||
extern void print_msg(const char *text)
|
||||
{
|
||||
print_message_fn(text);
|
||||
#if DEBUG
|
||||
printf("m:%p %s",fns.print_message_fn,text);
|
||||
report_fns("m");
|
||||
#endif
|
||||
fns.print_message_fn(text);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -82,7 +119,11 @@ extern void print_msg(const char *text)
|
|||
*/
|
||||
extern void print_err(const char *text)
|
||||
{
|
||||
print_error_fn(text);
|
||||
#if DEBUG
|
||||
printf("e:%p %s",fns.print_error_fn,text);
|
||||
report_fns("e");
|
||||
#endif
|
||||
fns.print_error_fn(text);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -93,7 +134,11 @@ extern void fprint_msg(const char *format, ...)
|
|||
{
|
||||
va_list va_arg;
|
||||
va_start(va_arg, format);
|
||||
fprint_message_fn(format, va_arg);
|
||||
#if DEBUG
|
||||
printf("fm:%p %s",fns.fprint_message_fn,format);
|
||||
report_fns("fm");
|
||||
#endif
|
||||
fns.fprint_message_fn(format, va_arg);
|
||||
va_end(va_arg);
|
||||
}
|
||||
|
||||
|
|
@ -105,13 +150,18 @@ extern void fprint_err(const char *format, ...)
|
|||
{
|
||||
va_list va_arg;
|
||||
va_start(va_arg, format);
|
||||
fprint_error_fn(format, va_arg);
|
||||
#if DEBUG
|
||||
printf("fe:%p %s",fns.fprint_error_fn,format);
|
||||
report_fns("fe");
|
||||
#endif
|
||||
fns.fprint_error_fn(format, va_arg);
|
||||
va_end(va_arg);
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// Choosing what the printing functions do
|
||||
// ============================================================
|
||||
|
||||
/*
|
||||
* Calling this causes errors to go to stderr, and all other output
|
||||
* to go to stdout. This is the "traditional" mechanism used by
|
||||
|
|
@ -119,10 +169,14 @@ extern void fprint_err(const char *format, ...)
|
|||
*/
|
||||
extern void redirect_output_traditional(void)
|
||||
{
|
||||
print_message_fn = &print_message_to_stdout;
|
||||
print_error_fn = &print_message_to_stderr;
|
||||
fprint_message_fn = &fprint_message_to_stdout;
|
||||
fprint_error_fn = &fprint_message_to_stderr;
|
||||
fns.print_message_fn = &print_message_to_stdout;
|
||||
fns.print_error_fn = &print_message_to_stderr;
|
||||
fns.fprint_message_fn = &fprint_message_to_stdout;
|
||||
fns.fprint_error_fn = &fprint_message_to_stderr;
|
||||
|
||||
#if DEBUG
|
||||
report_fns("traditional");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -134,10 +188,14 @@ extern void redirect_output_traditional(void)
|
|||
*/
|
||||
extern void redirect_output_stdout(void)
|
||||
{
|
||||
print_message_fn = &print_message_to_stdout;
|
||||
print_error_fn = &print_message_to_stdout;
|
||||
fprint_message_fn = &fprint_message_to_stdout;
|
||||
fprint_error_fn = &fprint_message_to_stdout;
|
||||
fns.print_message_fn = &print_message_to_stdout;
|
||||
fns.print_error_fn = &print_message_to_stdout;
|
||||
fns.fprint_message_fn = &fprint_message_to_stdout;
|
||||
fns.fprint_error_fn = &fprint_message_to_stdout;
|
||||
|
||||
#if DEBUG
|
||||
report_fns("stdout");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -170,14 +228,26 @@ extern int redirect_output( void (*new_print_message_fn) (const char *message),
|
|||
new_fprint_message_fn == NULL || new_fprint_error_fn == NULL)
|
||||
return 1;
|
||||
|
||||
print_message_fn = new_print_message_fn;
|
||||
print_error_fn = new_print_error_fn;
|
||||
fprint_message_fn = new_fprint_message_fn;
|
||||
fprint_error_fn = new_fprint_error_fn;
|
||||
fns.print_message_fn = new_print_message_fn;
|
||||
fns.print_error_fn = new_print_error_fn;
|
||||
fns.fprint_message_fn = new_fprint_message_fn;
|
||||
fns.fprint_error_fn = new_fprint_error_fn;
|
||||
|
||||
#if DEBUG
|
||||
report_fns("specific");
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
extern void test_C_printing(void)
|
||||
{
|
||||
print_msg("C Message\n");
|
||||
print_err("C Error\n");
|
||||
fprint_msg("C Message %s\n","Fred");
|
||||
fprint_err("C Error %s\n","Fred");
|
||||
}
|
||||
|
||||
|
||||
// Local Variables:
|
||||
// tab-width: 8
|
||||
|
|
|
|||
|
|
@ -92,6 +92,8 @@ extern int redirect_output( void (*new_print_message_fn) (const char *message),
|
|||
void (*new_fprint_error_fn) (const char *format, va_list arg_ptr)
|
||||
);
|
||||
|
||||
// Just for the moment
|
||||
extern void test_C_printing(void);
|
||||
#endif // _printing_fns
|
||||
|
||||
// Local Variables:
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue