X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=lib%2Fvirt_mem_utsname.ml;h=33ee969cc304acd3b04996f19af7f0159d6ba1a9;hb=f21906190fff095427d1c631dc295bb142d61cdf;hp=084ba92a5820138d8b693cf961d8d87b3131857a;hpb=e7fad361d3dbf1689a22fdd1ae5f5579d6ef5fb0;p=virt-mem.git

diff --git a/lib/virt_mem_utsname.ml b/lib/virt_mem_utsname.ml
index 084ba92..33ee969 100644
--- a/lib/virt_mem_utsname.ml
+++ b/lib/virt_mem_utsname.ml
@@ -24,16 +24,6 @@ open Virt_mem_utils
 open Virt_mem_types
 open Virt_mem_mmap
 
-(* Truncate an OCaml string at the first ASCII NUL character, ie. as
- * if it were a C string.
- *)
-let truncate str =
-  try
-    let i = String.index str '\000' in
-    String.sub str 0 i
-  with
-    Not_found -> str
-
 let parse_utsname bits =
   (* Expect the first (sysname) field to always be "Linux", which is
    * also a good way to tell if we're synchronized to the right bit of
@@ -48,11 +38,11 @@ let parse_utsname bits =
       domainname : 65*8 : string } ->
       Some {
 	kernel_name = "Linux";
-	nodename = truncate nodename;
-	kernel_release = truncate release;
-	kernel_version = truncate version;
-	machine = truncate machine;
-	domainname = truncate domainname
+	nodename = truncate_c_string nodename;
+	kernel_release = truncate_c_string release;
+	kernel_version = truncate_c_string version;
+	machine = truncate_c_string machine;
+	domainname = truncate_c_string domainname
       }
   | { _ } ->
       None