From: Zheng Li <dev@zheng.li>
To: xen-devel@lists.xensource.com
Subject: [PATCH 2 of 2] Change GET_C_STRUCT to Intf_val to follow the common naming scheme of OCaml macro
Date: Fri, 30 Sep 2011 15:40:00 +0000 [thread overview]
Message-ID: <c4bb6370a202e81564dd.1317397200@eta> (raw)
In-Reply-To: <patchbomb.1317397198@eta>
[-- Attachment #1: Type: text/plain, Size: 3181 bytes --]
... and for better readabilities.
Signed-off-by: Zheng Li <dev@zheng.li>
tools/ocaml/libs/mmap/mmap_stubs.c | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
----
diff --git a/tools/ocaml/libs/mmap/mmap_stubs.c b/tools/ocaml/libs/mmap/mmap_stubs.c
--- a/tools/ocaml/libs/mmap/mmap_stubs.c
+++ b/tools/ocaml/libs/mmap/mmap_stubs.c
@@ -28,7 +28,7 @@
#include <caml/fail.h>
#include <caml/callback.h>
-#define GET_C_STRUCT(a) ((struct mmap_interface *) a)
+#define Intf_val(a) ((struct mmap_interface *) a)
static int mmap_interface_init(struct mmap_interface *intf,
int fd, int pflag, int mflag,
@@ -61,27 +61,27 @@ CAMLprim value stub_mmap_init(value fd,
result = caml_alloc(sizeof(struct mmap_interface), Abstract_tag);
- if (mmap_interface_init(GET_C_STRUCT(result), Int_val(fd),
+ if (mmap_interface_init(Intf_val(result), Int_val(fd),
c_pflag, c_mflag,
Int_val(len), Int_val(offset)))
caml_failwith("mmap");
CAMLreturn(result);
}
-CAMLprim value stub_mmap_final(value interface)
+CAMLprim value stub_mmap_final(value intf)
{
- CAMLparam1(interface);
+ CAMLparam1(intf);
- if (GET_C_STRUCT(interface)->addr != MAP_FAILED)
- munmap(GET_C_STRUCT(interface)->addr, GET_C_STRUCT(interface)->len);
- GET_C_STRUCT(interface)->addr = MAP_FAILED;
+ if (Intf_val(intf)->addr != MAP_FAILED)
+ munmap(Intf_val(intf)->addr, Intf_val(intf)->len);
+ Intf_val(intf)->addr = MAP_FAILED;
CAMLreturn(Val_unit);
}
-CAMLprim value stub_mmap_read(value interface, value start, value len)
+CAMLprim value stub_mmap_read(value intf, value start, value len)
{
- CAMLparam3(interface, start, len);
+ CAMLparam3(intf, start, len);
CAMLlocal1(data);
int c_start;
int c_len;
@@ -89,33 +89,33 @@ CAMLprim value stub_mmap_read(value inte
c_start = Int_val(start);
c_len = Int_val(len);
- if (c_start > GET_C_STRUCT(interface)->len)
+ if (c_start > Intf_val(intf)->len)
caml_invalid_argument("start invalid");
- if (c_start + c_len > GET_C_STRUCT(interface)->len)
+ if (c_start + c_len > Intf_val(intf)->len)
caml_invalid_argument("len invalid");
data = caml_alloc_string(c_len);
- memcpy((char *) data, GET_C_STRUCT(interface)->addr + c_start, c_len);
+ memcpy((char *) data, Intf_val(intf)->addr + c_start, c_len);
CAMLreturn(data);
}
-CAMLprim value stub_mmap_write(value interface, value data,
+CAMLprim value stub_mmap_write(value intf, value data,
value start, value len)
{
- CAMLparam4(interface, data, start, len);
+ CAMLparam4(intf, data, start, len);
int c_start;
int c_len;
c_start = Int_val(start);
c_len = Int_val(len);
- if (c_start > GET_C_STRUCT(interface)->len)
+ if (c_start > Intf_val(intf)->len)
caml_invalid_argument("start invalid");
- if (c_start + c_len > GET_C_STRUCT(interface)->len)
+ if (c_start + c_len > Intf_val(intf)->len)
caml_invalid_argument("len invalid");
- memcpy(GET_C_STRUCT(interface)->addr + c_start, (char *) data, c_len);
+ memcpy(Intf_val(intf)->addr + c_start, (char *) data, c_len);
CAMLreturn(Val_unit);
}
[-- Attachment #2: xen-unstable.hg-2.patch --]
[-- Type: text/x-patch, Size: 3044 bytes --]
... and for better readabilities.
Signed-off-by: Zheng Li <dev@zheng.li>
diff --git a/tools/ocaml/libs/mmap/mmap_stubs.c b/tools/ocaml/libs/mmap/mmap_stubs.c
--- a/tools/ocaml/libs/mmap/mmap_stubs.c
+++ b/tools/ocaml/libs/mmap/mmap_stubs.c
@@ -28,7 +28,7 @@
#include <caml/fail.h>
#include <caml/callback.h>
-#define GET_C_STRUCT(a) ((struct mmap_interface *) a)
+#define Intf_val(a) ((struct mmap_interface *) a)
static int mmap_interface_init(struct mmap_interface *intf,
int fd, int pflag, int mflag,
@@ -61,27 +61,27 @@ CAMLprim value stub_mmap_init(value fd,
result = caml_alloc(sizeof(struct mmap_interface), Abstract_tag);
- if (mmap_interface_init(GET_C_STRUCT(result), Int_val(fd),
+ if (mmap_interface_init(Intf_val(result), Int_val(fd),
c_pflag, c_mflag,
Int_val(len), Int_val(offset)))
caml_failwith("mmap");
CAMLreturn(result);
}
-CAMLprim value stub_mmap_final(value interface)
+CAMLprim value stub_mmap_final(value intf)
{
- CAMLparam1(interface);
+ CAMLparam1(intf);
- if (GET_C_STRUCT(interface)->addr != MAP_FAILED)
- munmap(GET_C_STRUCT(interface)->addr, GET_C_STRUCT(interface)->len);
- GET_C_STRUCT(interface)->addr = MAP_FAILED;
+ if (Intf_val(intf)->addr != MAP_FAILED)
+ munmap(Intf_val(intf)->addr, Intf_val(intf)->len);
+ Intf_val(intf)->addr = MAP_FAILED;
CAMLreturn(Val_unit);
}
-CAMLprim value stub_mmap_read(value interface, value start, value len)
+CAMLprim value stub_mmap_read(value intf, value start, value len)
{
- CAMLparam3(interface, start, len);
+ CAMLparam3(intf, start, len);
CAMLlocal1(data);
int c_start;
int c_len;
@@ -89,33 +89,33 @@ CAMLprim value stub_mmap_read(value inte
c_start = Int_val(start);
c_len = Int_val(len);
- if (c_start > GET_C_STRUCT(interface)->len)
+ if (c_start > Intf_val(intf)->len)
caml_invalid_argument("start invalid");
- if (c_start + c_len > GET_C_STRUCT(interface)->len)
+ if (c_start + c_len > Intf_val(intf)->len)
caml_invalid_argument("len invalid");
data = caml_alloc_string(c_len);
- memcpy((char *) data, GET_C_STRUCT(interface)->addr + c_start, c_len);
+ memcpy((char *) data, Intf_val(intf)->addr + c_start, c_len);
CAMLreturn(data);
}
-CAMLprim value stub_mmap_write(value interface, value data,
+CAMLprim value stub_mmap_write(value intf, value data,
value start, value len)
{
- CAMLparam4(interface, data, start, len);
+ CAMLparam4(intf, data, start, len);
int c_start;
int c_len;
c_start = Int_val(start);
c_len = Int_val(len);
- if (c_start > GET_C_STRUCT(interface)->len)
+ if (c_start > Intf_val(intf)->len)
caml_invalid_argument("start invalid");
- if (c_start + c_len > GET_C_STRUCT(interface)->len)
+ if (c_start + c_len > Intf_val(intf)->len)
caml_invalid_argument("len invalid");
- memcpy(GET_C_STRUCT(interface)->addr + c_start, (char *) data, c_len);
+ memcpy(Intf_val(intf)->addr + c_start, (char *) data, c_len);
CAMLreturn(Val_unit);
}
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
prev parent reply other threads:[~2011-09-30 15:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-30 15:39 [PATCH 0 of 2] Invalid memory access in OCaml mmap library Zheng Li
2011-09-30 15:39 ` [PATCH 1 of 2] Fix invalid memory access in OCaml mmap library (to play nicely with the GC) Zheng Li
2011-09-30 16:34 ` Ian Campbell
2011-09-30 17:45 ` Zheng Li
2011-10-06 16:47 ` Ian Jackson
2011-09-30 15:40 ` Zheng Li [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c4bb6370a202e81564dd.1317397200@eta \
--to=dev@zheng.li \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.