bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove errmsg param, its in the struct now passed as the first param

This commit is contained in:
Doug MacEachern 2005-03-11 21:27:46 +00:00
parent 3c91457bce
commit b5dec9dde8
2 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/os/solaris/get_mib2.c
View File

@ -53,14 +53,12 @@ static char copyright[] =
* return:
*
* exit = GET_MIB2_OK if close succeeded
* GET_MIB2_* is the error code for failure and:
* *errmsg = failure error message
* GET_MIB2_* is the error code.
*/
int
close_mib2(solaris_mib2_t *mib2, char **errmsg)
close_mib2(solaris_mib2_t *mib2)
{
*errmsg = mib2->errmsg;
if (mib2->sd < 0) {
(void) strcpy(mib2->errmsg, "close_mib2: socket not open");
return(GET_MIB2_ERR_NOTOPEN);
@ -93,16 +91,14 @@ close_mib2(solaris_mib2_t *mib2, char **errmsg)
* *opt = opthdr structure address
* *data = data buffer address
* *datalen = size of data buffer
* GET_MIB2_* is the error code for failure and:
* *errmsg = failure error message
* GET_MIB2_* is the error code for failure.
*/
int
get_mib2(solaris_mib2_t *mib2,
struct opthdr **opt,
char **data,
int *datalen,
char **errmsg)
int *datalen)
{
struct T_optmgmt_ack *a; /* message ACK pointer */
struct strbuf c; /* streams control buffer */
@ -114,7 +110,6 @@ get_mib2(solaris_mib2_t *mib2,
struct T_optmgmt_req *r; /* message request pointer */
int rc; /* reply code */
*errmsg = mib2->errmsg;
/*
* If MIB2 access isn't open, open it and issue the preliminary stream
* messages.
@ -124,7 +119,7 @@ get_mib2(solaris_mib2_t *mib2,
/*
* Open access. Return on error.
*/
if ((err = open_mib2(mib2, errmsg))) {
if ((err = open_mib2(mib2))) {
return(err);
}
/*
@ -184,7 +179,7 @@ get_mib2(solaris_mib2_t *mib2,
&& a->MGMT_flags == T_SUCCESS
&& o->len == 0)
{
err = close_mib2(mib2, errmsg);
err = close_mib2(mib2);
if (err) {
return(err);
}
@ -267,14 +262,12 @@ get_mib2(solaris_mib2_t *mib2,
* return:
*
* exit = GET_MIB2_OK if open succeeded
* GET_MIB2_* is the error code for failure and:
* *errmsg = failure error message
* GET_MIB2_* is the error code for failure.
*/
int
open_mib2(solaris_mib2_t *mib2, char **errmsg)
open_mib2(solaris_mib2_t *mib2)
{
*errmsg = mib2->errmsg;
/*
* It's an error if the stream device is already open.
*/

24
src/os/solaris/get_mib2.h
View File

@ -103,36 +103,18 @@ typedef struct {
*/
int close_mib2( /* close acccess to MIB2 information */
solaris_mib2_t *mib2,
char **errmsg /* error message buffer return
* address (if return value
* > GET_MIB2_OK.) The error
* message buffer address will
* be NULL if no buffer has
* been defined. */
solaris_mib2_t *mib2
);
int get_mib2( /* get MIB2 information */
solaris_mib2_t *mib2,
struct opthdr **opt, /* opthdr pointer return (see
* <sys/socket.h> */
char **data, /* data buffer return address */
int *datalen, /* data buffer length return
int *datalen /* data buffer length return
* address */
char **errmsg /* error message buffer return
* address (if return value
* > GET_MIB2_OK.) The error
* message buffer address will
* be NULL if no buffer has
* been defined. */
);
int open_mib2( /* open acccess to MIB2 information */
solaris_mib2_t *mib2,
char **errmsg /* error message buffer return
* address (if return value
* > GET_MIB2_OK.) The error
* message buffer address will
* be NULL if no buffer has
* been defined. */
solaris_mib2_t *mib2
);
#endif /* !defined(GET_MIB2_H) */