diff options
| author | C. Davis <cd.rattan@gmail.com> | 2012-08-08 20:16:05 -0700 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-04-29 13:06:15 +0200 |
| commit | ec6fb5d1ce75fa3746f473727f2533e629bdb136 (patch) | |
| tree | ac3a639059e47242981a5962e4109e99919bdef3 | |
| parent | 7c60ec12dec39ec63bf8246d478d9335a6451fb4 (diff) | |
| download | samba-ec6fb5d1ce75fa3746f473727f2533e629bdb136.tar.gz samba-ec6fb5d1ce75fa3746f473727f2533e629bdb136.tar.bz2 samba-ec6fb5d1ce75fa3746f473727f2533e629bdb136.zip | |
regedit: Initialize hexedit buf with data if available.
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | source3/utils/regedit_hexedit.c | 6 | ||||
| -rw-r--r-- | source3/utils/regedit_hexedit.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source3/utils/regedit_hexedit.c b/source3/utils/regedit_hexedit.c index c86feaddb0..42eee8f78a 100644 --- a/source3/utils/regedit_hexedit.c +++ b/source3/utils/regedit_hexedit.c @@ -23,7 +23,7 @@ static int hexedit_free(struct hexedit *buf) } struct hexedit *hexedit_new(TALLOC_CTX *ctx, WINDOW *parent, int nlines, - int y, int x, size_t sz) + int y, int x, const void *data, size_t sz) { struct hexedit *buf; @@ -39,6 +39,10 @@ struct hexedit *hexedit_new(TALLOC_CTX *ctx, WINDOW *parent, int nlines, goto fail; } + if (data) { + memcpy(buf->data, data, sz); + } + buf->len = sz; buf->alloc_size = sz; buf->win = derwin(parent, nlines, LINE_WIDTH, y, x); diff --git a/source3/utils/regedit_hexedit.h b/source3/utils/regedit_hexedit.h index 1a2db912be..bca8324d8d 100644 --- a/source3/utils/regedit_hexedit.h +++ b/source3/utils/regedit_hexedit.h @@ -41,7 +41,7 @@ struct hexedit { }; struct hexedit *hexedit_new(TALLOC_CTX *ctx, WINDOW *parent, int nlines, - int y, int x, size_t sz); + int y, int x, const void *data, size_t sz); void hexedit_set_cursor(struct hexedit *buf); void hexedit_refresh(struct hexedit *buf); void hexedit_driver(struct hexedit *buf, int c); |