diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-02-21 22:08:01 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-02-21 22:08:01 +0100 |
| commit | cf1e8e792f60949e09e3ad4c53fb61b0b7628229 (patch) | |
| tree | 35080229c9e3b46e5db14a2f051c001ab8c6e586 /lisp/emacs-lisp/bindat.el | |
| parent | 39792cf62987ecc1a772f6a2027d6b32c70e8312 (diff) | |
| parent | d0c47652e527397cae96444c881bf60455c763c1 (diff) | |
| download | emacs-cf1e8e792f60949e09e3ad4c53fb61b0b7628229.tar.gz emacs-cf1e8e792f60949e09e3ad4c53fb61b0b7628229.tar.bz2 emacs-cf1e8e792f60949e09e3ad4c53fb61b0b7628229.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/bindat.el')
| -rw-r--r-- | lisp/emacs-lisp/bindat.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el index 1f5022c2743..b1b2144e3de 100644 --- a/lisp/emacs-lisp/bindat.el +++ b/lisp/emacs-lisp/bindat.el @@ -41,23 +41,23 @@ ;; Consider the following C structures: ;; ;; struct header { -;; unsigned long dest_ip; -;; unsigned long src_ip; -;; unsigned short dest_port; -;; unsigned short src_port; +;; uint32_t dest_ip; +;; uint32_t src_ip; +;; uint16_t dest_port; +;; uint16_t src_port; ;; }; ;; ;; struct data { -;; unsigned char type; -;; unsigned char opcode; -;; unsigned long length; /* In little endian order */ +;; uint8_t type; +;; uint8_t opcode; +;; uint32_t length; /* In little endian order */ ;; unsigned char id[8]; /* nul-terminated string */ ;; unsigned char data[/* (length + 3) & ~3 */]; ;; }; ;; ;; struct packet { ;; struct header header; -;; unsigned char items; +;; uint8_t items; ;; unsigned char filler[3]; ;; struct data item[/* items */]; ;; }; @@ -75,7 +75,7 @@ ;; (bindat-spec ;; (type u8) ;; (opcode u8) -;; (length u16r) ;; little endian order +;; (length u32r) ;; little endian order ;; (id strz 8) ;; (data vec (length)) ;; (align 4))) |