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

os_errno is not used by libisofs, and thus is removed from API.

This commit is contained in:
Vreixo Formoso 2008-01-27 18:38:55 +01:00
parent 0869f7d472
commit 39ec815ff1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libisofs/libisofs.h
View File

@ -1902,13 +1902,12 @@ int iso_set_msgs_severities(char *queue_severity, char *print_severity,
* @param error_code Will become a unique error code as listed in error.h * @param error_code Will become a unique error code as listed in error.h
* @param imgid Id of the image that was issued the message. * @param imgid Id of the image that was issued the message.
* @param msg_text Must provide at least ISO_MSGS_MESSAGE_LEN bytes. * @param msg_text Must provide at least ISO_MSGS_MESSAGE_LEN bytes.
* @param os_errno Will become the eventual errno related to the message
* @param severity Will become the severity related to the message and * @param severity Will become the severity related to the message and
* should provide at least 80 bytes. * should provide at least 80 bytes.
* @return 1 if a matching item was found, 0 if not, <0 for severe errors * @return 1 if a matching item was found, 0 if not, <0 for severe errors
*/ */
int iso_obtain_msgs(char *minimum_severity, int *error_code, int *imgid, int iso_obtain_msgs(char *minimum_severity, int *error_code, int *imgid,
char msg_text[], int *os_errno, char severity[]); char msg_text[], char severity[]);
/** /**
* Get the id of an IsoImage, used for message reporting. This message id, * Get the id of an IsoImage, used for message reporting. This message id,

9
libisofs/messages.c
View File

@ -251,16 +251,16 @@ int iso_set_msgs_severities(char *queue_severity, char *print_severity,
* will discard the whole queue. * will discard the whole queue.
* *
* @param error_code Will become a unique error code as listed in messages.h * @param error_code Will become a unique error code as listed in messages.h
* @param imgid Id of the image that was issued the message.
* @param msg_text Must provide at least ISO_MSGS_MESSAGE_LEN bytes. * @param msg_text Must provide at least ISO_MSGS_MESSAGE_LEN bytes.
* @param os_errno Will become the eventual errno related to the message
* @param severity Will become the severity related to the message and * @param severity Will become the severity related to the message and
* should provide at least 80 bytes. * should provide at least 80 bytes.
* @return 1 if a matching item was found, 0 if not, <0 for severe errors * @return 1 if a matching item was found, 0 if not, <0 for severe errors
*/ */
int iso_obtain_msgs(char *minimum_severity, int *error_code, int *imgid, int iso_obtain_msgs(char *minimum_severity, int *error_code, int *imgid,
char msg_text[], int *os_errno, char severity[]) char msg_text[], char severity[])
{ {
int ret, minimum_sevno, sevno, priority; int ret, minimum_sevno, sevno, priority, os_errno;
double timestamp; double timestamp;
pid_t pid; pid_t pid;
char *textpt, *sev_name; char *textpt, *sev_name;
@ -273,14 +273,13 @@ int iso_obtain_msgs(char *minimum_severity, int *error_code, int *imgid,
LIBISO_MSGS_PRIO_ZERO, 0); LIBISO_MSGS_PRIO_ZERO, 0);
if (ret <= 0) if (ret <= 0)
goto ex; goto ex;
ret = libiso_msgs_item_get_msg(item, error_code, &textpt, os_errno, 0); ret = libiso_msgs_item_get_msg(item, error_code, &textpt, &os_errno, 0);
if (ret <= 0) if (ret <= 0)
goto ex; goto ex;
strncpy(msg_text, textpt, ISO_MSGS_MESSAGE_LEN-1); strncpy(msg_text, textpt, ISO_MSGS_MESSAGE_LEN-1);
if (strlen(textpt) >= ISO_MSGS_MESSAGE_LEN) if (strlen(textpt) >= ISO_MSGS_MESSAGE_LEN)
msg_text[ISO_MSGS_MESSAGE_LEN-1] = 0; msg_text[ISO_MSGS_MESSAGE_LEN-1] = 0;
ret = libiso_msgs_item_get_origin(item, &timestamp, &pid, imgid, 0); ret = libiso_msgs_item_get_origin(item, &timestamp, &pid, imgid, 0);
if (ret <= 0) if (ret <= 0)
goto ex; goto ex;