[Emacs-diffs] scratch/tzz/nettle cb60baf: WIP: GnuTLS: get extract_data_from_object arguments better

[Teodor Zlatanov]

branch: scratch/tzz/nettle
commit cb60baf4bcd1e5e57fdf76874eba2df97d29b1da
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    WIP: GnuTLS: get extract_data_from_object arguments better
---
 src/fns.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/fns.c b/src/fns.c
index d04e1a1..720f6cb 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -4768,11 +4768,19 @@ extract_data_from_object (Lisp_Object spec,
   register struct buffer *bp;
   EMACS_INT temp;
 
-  Lisp_Object object        = Fnth (make_number (0), spec);
-  Lisp_Object start        = Fnth (make_number (1), spec);
-  Lisp_Object end          = Fnth (make_number (2), spec);
-  Lisp_Object coding_system = Fnth (make_number (3), spec);
-  Lisp_Object noerror      = Fnth (make_number (4), spec);
+  Lisp_Object object        = XCAR (spec);
+
+  if (! NILP (spec)) spec = XCDR (spec);
+  Lisp_Object start        = (CONSP (spec)) ? XCAR (spec) : Qnil;
+
+  if (! NILP (spec)) spec = XCDR (spec);
+  Lisp_Object end          = (CONSP (spec)) ? XCAR (spec) : Qnil;
+
+  if (! NILP (spec)) spec = XCDR (spec);
+  Lisp_Object coding_system = (CONSP (spec)) ? XCAR (spec) : Qnil;
+
+  if (! NILP (spec)) spec = XCDR (spec);
+  Lisp_Object noerror      = (CONSP (spec)) ? XCAR (spec) : Qnil;
 
   if (STRINGP (object))
     {