Changeset 5a6cc679 in mainline for uspace/lib/compress

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

Location:

uspace/lib/compress

Files:

• gzip.c (modified) (2 diffs)
• gzip.h (modified) (1 diff)
• inflate.c (modified) (9 diffs)
• inflate.h (modified) (1 diff)

uspace/lib/compress/gzip.c

@@ -85 +85 @@
  *
  */
-int gzip_expand(void *src, size_t srclen, void **dest, size_t *destlen)
+errno_t gzip_expand(void *src, size_t srclen, void **dest, size_t *destlen)
 {
         gzip_header_t header;
@@ -174 +174 @@
                 return ENOMEM;
         
-        int ret = inflate(stream, stream_length, *dest, *destlen);
+        errno_t ret = inflate(stream, stream_length, *dest, *destlen);
         if (ret != EOK) {
                 free(dest);

uspace/lib/compress/gzip.h

@@ -32 +32 @@
 #include <stddef.h>
 
-extern int gzip_expand(void *, size_t, void **, size_t *);
+extern errno_t gzip_expand(void *, size_t, void **, size_t *);
 
 #endif

uspace/lib/compress/inflate.c

@@ -270 +270 @@
  *
  */
-static int inflate_stored(inflate_state_t *state)
+static errno_t inflate_stored(inflate_state_t *state)
 {
         /* Discard bits in the bit buffer */
@@ -316 +316 @@
  *
  */
-static int huffman_decode(inflate_state_t *state, huffman_t *huffman,
+static errno_t huffman_decode(inflate_state_t *state, huffman_t *huffman,
     uint16_t *symbol)
 {
@@ -418 +418 @@
  *
  */
-static int inflate_codes(inflate_state_t *state, huffman_t* len_code,
+static errno_t inflate_codes(inflate_state_t *state, huffman_t* len_code,
     huffman_t* dist_code)
 {
@@ -424 +424 @@
         
         do {
-                int err = huffman_decode(state, len_code, &symbol);
+                errno_t err = huffman_decode(state, len_code, &symbol);
                 if (err != EOK) {
                         /* Error decoding */
@@ -484 +484 @@
  *
  */
-static int inflate_fixed(inflate_state_t *state, huffman_t *len_code,
+static errno_t inflate_fixed(inflate_state_t *state, huffman_t *len_code,
     huffman_t *dist_code)
 {
@@ -501 +501 @@
  *
  */
-static int inflate_dynamic(inflate_state_t *state)
+static errno_t inflate_dynamic(inflate_state_t *state)
 {
         uint16_t length[MAX_CODE];
@@ -551 +551 @@
         while (index < nlen + ndist) {
                 uint16_t symbol;
-                int err = huffman_decode(state, &dyn_len_code, &symbol);
+                errno_t err = huffman_decode(state, &dyn_len_code, &symbol);
                 if (err != EOK)
                         return EOK;
@@ -618 +618 @@
  *
  */
-int inflate(void *src, size_t srclen, void *dest, size_t destlen)
+errno_t inflate(void *src, size_t srclen, void *dest, size_t destlen)
 {
         /* Initialize the state */
@@ -637 +637 @@
         
         uint16_t last;
-        int ret = EOK;
+        errno_t ret = EOK;
         
         do {

uspace/lib/compress/inflate.h

@@ -32 +32 @@
 #include <stddef.h>
 
-extern int inflate(void *, size_t, void *, size_t);
+extern errno_t inflate(void *, size_t, void *, size_t);
 
 #endif