d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make gctl_error() take printfline varargs.

Browse Source
This commit is contained in:
phk 2003-04-23 07:50:01 +00:00
parent 634d29cedc
commit dd830ea830
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/geom/geom.h
View File

@ -334,6 +334,7 @@ extern struct sx topology_lock;
/* geom_ctl.c */
void *gctl_get_param(struct gctl_req *req, const char *param, int *len);
int gctl_error(struct gctl_req *req, const char *errtxt);
void *gctl_get_paraml(struct gctl_req *req, const char *param, int len);
int gctl_error(struct gctl_req *req, const char *fmt, ...);
#endif /* _GEOM_GEOM_H_ */

23
sys/geom/geom_ctl.c
View File

@ -46,6 +46,7 @@
#include <sys/disk.h>
#include <sys/malloc.h>
#include <sys/sysctl.h>
#include <sys/sbuf.h>
#include <sys/lock.h>
#include <sys/mutex.h>
@ -59,6 +60,8 @@
#include <geom/geom_ctl.h>
#include <geom/geom_ext.h>
#include <machine/stdarg.h>
static d_ioctl_t g_ctl_ioctl;
static struct cdevsw g_ctl_cdevsw = {
@ -87,16 +90,28 @@ g_ctl_init(void)
* XXX: should take printf like args.
*/
int
gctl_error(struct gctl_req *req, const char *errtxt)
gctl_error(struct gctl_req *req, const char *fmt, ...)
{
int error;
va_list ap;
struct sbuf *sb;
sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
if (sb == NULL) {
error = copyout(fmt, req->error,
imin(req->lerror, strlen(fmt) + 1));
} else {
va_start(ap, fmt);
sbuf_vprintf(sb, fmt, ap);
sbuf_finish(sb);
if (g_debugflags & G_F_CTLDUMP)
printf("gctl %p error \"%s\"\n", req, errtxt);
error = copyout(errtxt, req->error,
imin(req->lerror, strlen(errtxt) + 1));
printf("gctl %p error \"%s\"\n", req, sbuf_data(sb));
error = copyout(sbuf_data(sb), req->error,
imin(req->lerror, sbuf_len(sb) + 1));
}
if (!error)
error = EINVAL;
sbuf_delete(sb);
return (error);
}