libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed meaning of .driveno to .origin, introduced LIBDAX_MSGS_ORIGIN_* macros

Browse Source
This commit is contained in:
Thomas Schmitt 2008-01-17 18:51:46 +00:00
parent e93962375c
commit 30085e9ef0
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libburn/trunk/cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2007.12.24.141959" #define Cdrskin_timestamP "2008.01.17.185051"

14
libburn/trunk/libburn/libdax_msgs.c
View File

@ -1,8 +1,8 @@
/* libdax_msgs /* libdax_msgs
Message handling facility of libdax. Message handling facility of libdax.
Copyright (C) 2006 - 2007 Thomas Schmitt <scdbackup@gmx.net>, Copyright (C) 2006 - 2008 Thomas Schmitt <scdbackup@gmx.net>,
provided under GPL provided under GPL version 2
*/ */
#include <stdio.h> #include <stdio.h>
@ -40,7 +40,7 @@ static int libdax_msgs_item_new(struct libdax_msgs_item **item,
if(ret==0) if(ret==0)
o->timestamp= tv.tv_sec+0.000001*tv.tv_usec; o->timestamp= tv.tv_sec+0.000001*tv.tv_usec;
o->process_id= getpid(); o->process_id= getpid();
o->driveno= -1; o->origin= -1;
o->severity= LIBDAX_MSGS_SEV_ALL; o->severity= LIBDAX_MSGS_SEV_ALL;
o->priority= LIBDAX_MSGS_PRIO_ZERO; o->priority= LIBDAX_MSGS_PRIO_ZERO;
o->error_code= 0; o->error_code= 0;
@ -109,12 +109,12 @@ int libdax_msgs_item_get_msg(struct libdax_msgs_item *item,
int libdax_msgs_item_get_origin(struct libdax_msgs_item *item, int libdax_msgs_item_get_origin(struct libdax_msgs_item *item,
double *timestamp, pid_t *process_id, int *driveno, double *timestamp, pid_t *process_id, int *origin,
int flag) int flag)
{ {
*timestamp= item->timestamp; *timestamp= item->timestamp;
*process_id= item->process_id; *process_id= item->process_id;
*driveno= item->driveno; *origin= item->origin;
return(1); return(1);
} }
@ -311,7 +311,7 @@ int libdax_msgs__sev_to_text(int severity, char **severity_name,
} }
int libdax_msgs_submit(struct libdax_msgs *m, int driveno, int error_code, int libdax_msgs_submit(struct libdax_msgs *m, int origin, int error_code,
int severity, int priority, char *msg_text, int severity, int priority, char *msg_text,
int os_errno, int flag) int os_errno, int flag)
{ {
@ -349,7 +349,7 @@ int libdax_msgs_submit(struct libdax_msgs *m, int driveno, int error_code,
ret= libdax_msgs_item_new(&item,m->youngest,0); ret= libdax_msgs_item_new(&item,m->youngest,0);
if(ret<=0) if(ret<=0)
goto failed; goto failed;
item->driveno= driveno; item->origin= origin;
item->error_code= error_code; item->error_code= error_code;
item->severity= severity; item->severity= severity;
item->priority= priority; item->priority= priority;

26
libburn/trunk/libburn/libdax_msgs.h
View File

@ -1,8 +1,8 @@
/* libdax_msgs /* libdax_msgs
Message handling facility of libdax. Message handling facility of libdax.
Copyright (C) 2006-2007 Thomas Schmitt <scdbackup@gmx.net>, Copyright (C) 2006-2008 Thomas Schmitt <scdbackup@gmx.net>,
provided under GPL provided under GPL version 2
*/ */
@ -23,7 +23,7 @@ struct libdax_msgs_item {
double timestamp; double timestamp;
pid_t process_id; pid_t process_id;
int driveno; int origin;
int severity; int severity;
int priority; int priority;
@ -173,6 +173,16 @@ struct libdax_msgs_item;
#define LIBDAX_MSGS_PRIO_NEVER 0x7fffffff #define LIBDAX_MSGS_PRIO_NEVER 0x7fffffff
/* Origin numbers of libburn drives may range from 0 to 1048575 */
#define LIBDAX_MSGS_ORIGIN_DRIVE_BASE 0
#define LIBDAX_MSGS_ORIGIN_DRIVE_TOP 0xfffff
/* Origin numbers of libisofs images may range from 1048575 to 2097152 */
#define LIBDAX_MSGS_ORIGIN_IMAGE_BASE 0x100000
#define LIBDAX_MSGS_ORIGIN_IMAGE_TOP 0x1fffff
/* Public Functions */ /* Public Functions */
/* Calls initiated from inside the direct owner (e.g. from libburn) */ /* Calls initiated from inside the direct owner (e.g. from libburn) */
@ -211,7 +221,10 @@ int libdax_msgs_refer(struct libdax_msgs **pt, struct libdax_msgs *o, int flag);
/** Submit a message to a message handling facility. /** Submit a message to a message handling facility.
@param driveno program specific drive number. Use -1 if no number is known. @param origin program specific identification number of the originator of
a message. E.g. drive number. Programs should have an own
range of origin numbers. See above LIBDAX_MSGS_ORIGIN_*_BASE
Use -1 if no number is known.
@param error_code Unique error code. Use only registered codes. See below. @param error_code Unique error code. Use only registered codes. See below.
The same unique error_code may be issued at different The same unique error_code may be issued at different
occasions but those should be equivalent out of the view occasions but those should be equivalent out of the view
@ -224,11 +237,12 @@ int libdax_msgs_refer(struct libdax_msgs **pt, struct libdax_msgs *o, int flag);
@param flag Bitfield for control purposes (unused yet, submit 0) @param flag Bitfield for control purposes (unused yet, submit 0)
@return 1 on success, 0 on rejection, <0 for severe errors @return 1 on success, 0 on rejection, <0 for severe errors
*/ */
int libdax_msgs_submit(struct libdax_msgs *m, int driveno, int error_code, int libdax_msgs_submit(struct libdax_msgs *m, int origin, int error_code,
int severity, int priority, char *msg_text, int severity, int priority, char *msg_text,
int os_errno, int flag); int os_errno, int flag);
/* Calls from applications (to be forwarded by direct owner) */ /* Calls from applications (to be forwarded by direct owner) */
@ -300,7 +314,7 @@ int libdax_msgs_item_get_msg(struct libdax_msgs_item *item,
@return 1 on success, 0 on invalid item, <0 for servere errors @return 1 on success, 0 on invalid item, <0 for servere errors
*/ */
int libdax_msgs_item_get_origin(struct libdax_msgs_item *item, int libdax_msgs_item_get_origin(struct libdax_msgs_item *item,
double *timestamp, pid_t *process_id, int *driveno, double *timestamp, pid_t *process_id, int *origin,
int flag); int flag);