diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2018-04-01 15:37:53 +0000 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2018-04-01 15:37:53 +0000 |
| commit | a16494f8a264814a328adbbb2d51af8f0bc5cab8 (patch) | |
| tree | 761fcb2aab62eba8d975c444e2b9eec3787a8109 /src/structdump.h | |
| parent | db24197ddd55e9578c129ec5b4e30cb2cc2a580b (diff) | |
| download | lynx-snapshots-a16494f8a264814a328adbbb2d51af8f0bc5cab8.tar.gz | |
snapshot of project "lynx", label v2-8-9dev_17f
Diffstat (limited to 'src/structdump.h')
| -rw-r--r-- | src/structdump.h | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/src/structdump.h b/src/structdump.h index a084486b..78e25db8 100644 --- a/src/structdump.h +++ b/src/structdump.h @@ -32,9 +32,9 @@ CTRACE((tfp, "\n" \ (L), sizeof(*((L))), \ (L)->lname, (L)->lname, (L)->target, (L)->target, \ (L)->l_hightext, (L)->l_hightext, \ - (L)->l_hightext2, (L)->l_hightext2, \ + (L)->l_hightext2, (L)->l_hightext2, \ (L)->l_hightext2_offset, \ - (L)->inUnderline, (L)->lx, (L)->ly, \ + (L)->inUnderline, (L)->lx, (L)->ly, \ (L)->type, (L)->anchor_number, (L)->anchor_line_num, (L)->form)); \ }else{ \ CTRACE((tfp, "\n" \ @@ -46,18 +46,14 @@ CTRACE_FLUSH(tfp); #define DUMPSTRUCT_ANCHOR(A,X) \ if ((A)) { \ CTRACE((tfp, "\n" \ - "KED: anchor_ptr=%p sizeof=%d ["X"]\n" \ + "KED: anchor_ptr=%p sizeof=%lu ["X"]\n" \ "TextAnchor struct {\n" \ " *next=%p\n" \ + " *prev=%p\n" \ " number=%d\n" \ " line_pos=%d\n" \ " extent=%d\n" \ " line_num=%d\n" \ - " *hightext=%p\n" \ - " hightext=|%s|\n" \ - " *hightext2=%p\n" \ - " hightext2=|%s|\n" \ - " hightext2offset=%d\n" \ " link_type=%d\n" \ " *input_field=%p\n" \ " input_field=|%s|\n" \ @@ -66,12 +62,14 @@ CTRACE((tfp, "\n" \ " expansion_anch=%1x\n" \ " *anchor=%p\n" \ "}\n", \ - (A), sizeof(*((A))), \ - (A)->next, (A)->number, (A)->line_pos, \ + (A), (unsigned long) sizeof(*((A))), \ + (A)->next, (A)->prev, \ + (A)->number, (A)->line_pos, \ (A)->extent, (A)->line_num, \ - (A)->hightext, (A)->hightext, (A)->hightext2, (A)->hightext2, \ - (A)->hightext2offset, (A)->link_type, \ - (A)->input_field, (A)->input_field->name, (A)->show_anchor, \ + (A)->link_type, \ + (A)->input_field, \ + (A)->input_field ? NonNull((A)->input_field->name) : "", \ + (A)->show_anchor, \ (A)->inUnderline, (A)->expansion_anch, (A)->anchor)); \ }else{ \ CTRACE((tfp, "\n" \ @@ -83,7 +81,7 @@ CTRACE_FLUSH(tfp); #define DUMPSTRUCT_FORMINFO(F,X) \ if ((F)) { \ CTRACE((tfp, "\n" \ - "KED: forminfo_ptr=%p sizeof=%d ["X"]\n" \ + "KED: forminfo_ptr=%p sizeof=%lu ["X"]\n" \ "FormInfo struct {\n" \ " *name=%p\n" \ " name=|%s|\n" \ @@ -94,7 +92,7 @@ CTRACE((tfp, "\n" \ " *orig_value=%p\n" \ " orig_value=|%s|\n" \ " size=%d\n" \ - " maxlength=%d\n" \ + " maxlength=%lu\n" \ " group=%d\n" \ " num_value=%d\n" \ " hrange=%d\n" \ @@ -114,15 +112,23 @@ CTRACE((tfp, "\n" \ " value_cs=%d\n" \ " accept_cs=|%s|\n" \ "}\n", \ - (F), sizeof(*((F))), \ - (F)->name, (F)->name, (F)->number, (F)->type, \ - (F)->value, (F)->value, (F)->orig_value, (F)->orig_value, \ - (F)->size, (F)->maxlength, (F)->group, (F)->num_value, \ - (F)->hrange, (F)->lrange, (F)->select_list, (F)->submit_action, \ - (F)->submit_method, (F)->submit_enctype, (F)->submit_title, \ - (F)->no_cache, (F)->cp_submit_value, (F)->orig_submit_value, \ + (F), (unsigned long) sizeof(*((F))), \ + (F)->name, NonNull((F)->name), \ + (F)->number, (F)->type, \ + (F)->value, NonNull((F)->value), \ + (F)->orig_value, NonNull((F)->orig_value), \ + (F)->size, (unsigned long) (F)->maxlength, \ + (F)->group, (F)->num_value, \ + (F)->hrange, (F)->lrange, (F)->select_list, \ + NonNull((F)->submit_action), \ + (F)->submit_method, \ + NonNull((F)->submit_enctype), \ + NonNull((F)->submit_title), \ + (F)->no_cache, \ + NonNull((F)->cp_submit_value), \ + NonNull((F)->orig_submit_value), \ (F)->size_l, (F)->disabled, (F)->readonly, (F)->name_cs, (F)->value_cs, \ - (F)->accept_cs)); \ + NonNull((F)->accept_cs))); \ } else { \ CTRACE((tfp, "\n" \ "KED: forminfo_ptr=0x00000000 (NULL) ["X"]\n")); \ |