X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=generator%2Fgenerator_php.ml;h=4431147f73fabd6933200c83aea150930ef0937a;hb=2cac52000a6a96a583af72e289a4296c596047d5;hp=d405656dbf62228057255449b833acad8ed65a7f;hpb=4ada0a7815075c9cbe9d8b00da791c105ae739a9;p=libguestfs.git

diff --git a/generator/generator_php.ml b/generator/generator_php.ml
index d405656..4431147 100644
--- a/generator/generator_php.ml
+++ b/generator/generator_php.ml
@@ -357,28 +357,27 @@ PHP_FUNCTION (guestfs_last_error)
       );
 
       (* Return value. *)
-      let error_code =
-        match ret with
-        | RErr -> pr "  int r;\n"; "-1"
-        | RBool _
-        | RInt _ -> pr "  int r;\n"; "-1"
-        | RInt64 _ -> pr "  int64_t r;\n"; "-1"
-        | RConstString _ -> pr "  const char *r;\n"; "NULL"
-        | RConstOptString _ -> pr "  const char *r;\n"; "NULL"
-        | RString _ ->
-            pr "  char *r;\n"; "NULL"
-        | RStringList _ ->
-            pr "  char **r;\n"; "NULL"
-        | RStruct (_, typ) ->
-            pr "  struct guestfs_%s *r;\n" typ; "NULL"
-        | RStructList (_, typ) ->
-            pr "  struct guestfs_%s_list *r;\n" typ; "NULL"
-        | RHashtable _ ->
-            pr "  char **r;\n"; "NULL"
-        | RBufferOut _ ->
-            pr "  char *r;\n";
-            pr "  size_t size;\n";
-            "NULL" in
+      (match ret with
+       | RErr -> pr "  int r;\n"
+       | RBool _
+       | RInt _ -> pr "  int r;\n"
+       | RInt64 _ -> pr "  int64_t r;\n"
+       | RConstString _ -> pr "  const char *r;\n"
+       | RConstOptString _ -> pr "  const char *r;\n"
+       | RString _ ->
+           pr "  char *r;\n"
+       | RStringList _ ->
+           pr "  char **r;\n"
+       | RStruct (_, typ) ->
+           pr "  struct guestfs_%s *r;\n" typ
+       | RStructList (_, typ) ->
+           pr "  struct guestfs_%s_list *r;\n" typ
+       | RHashtable _ ->
+           pr "  char **r;\n"
+       | RBufferOut _ ->
+           pr "  char *r;\n";
+           pr "  size_t size;\n"
+      );
 
       (* Call the function. *)
       if optargs = [] then
@@ -410,9 +409,17 @@ PHP_FUNCTION (guestfs_last_error)
         ) args;
 
       (* Check for errors. *)
-      pr "  if (r == %s) {\n" error_code;
-      pr "    RETURN_FALSE;\n";
-      pr "  }\n";
+      (match errcode_of_ret ret with
+       | `CannotReturnError -> ()
+       | `ErrorIsMinusOne ->
+           pr "  if (r == -1) {\n";
+           pr "    RETURN_FALSE;\n";
+           pr "  }\n"
+       | `ErrorIsNULL ->
+           pr "  if (r == NULL) {\n";
+           pr "    RETURN_FALSE;\n";
+           pr "  }\n"
+      );
       pr "\n";
 
       (* Convert the return value. *)