Changeset 24fda5e in mainline for uspace/lib

Timestamp:

2018-06-05T16:05:16Z (7 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

18ad56a8, 8404342

Parents:

04051b8e

Message:

separate the TAR extraction to a library to make the code reusable

Location:

uspace/lib/untar

Files:

• Makefile (added)
• private/tar.h (moved) (moved from uspace/app/untar/tar.h ) (2 diffs)
• tar.c (moved) (moved from uspace/app/untar/tar.c ) (4 diffs)
• untar.c (added)
• untar.h (added)

uspace/lib/untar/private/tar.h

@@ -27 +27 @@
  */
 
-/** @addtogroup untar
+/** @addtogroup libuntar
  * @{
  */
 /** @file
  */
-#ifndef TAR_H_GUARD
-#define TAR_H_GUARD
+
+#ifndef TAR_H_
+#define TAR_H_
 
 #define TAR_BLOCK_SIZE 512
@@ -69 +70 @@
 } tar_header_t;
 
-
 extern errno_t tar_header_parse(tar_header_t *, const tar_header_raw_t *);
 extern tar_type_t tar_type_parse(const char);

uspace/lib/untar/tar.c

@@ -27 +27 @@
  */
 
-/** @addtogroup untar
+/** @addtogroup libuntar
  * @{
  */
@@ -38 +38 @@
 #include <errno.h>
 #include <assert.h>
-
-#include "tar.h"
+#include "private/tar.h"
 
 tar_type_t tar_type_parse(const char type)
@@ -71 +70 @@
 errno_t tar_header_parse(tar_header_t *parsed, const tar_header_raw_t *raw)
 {
-        errno_t rc;
-
         if (str_length(raw->filename) == 0) {
                 return EEMPTY;
@@ -78 +75 @@
 
         size_t size;
-        rc = str_size_t(raw->size, NULL, 8, true, &size);
+        errno_t rc = str_size_t(raw->size, NULL, 8, true, &size);
         if (rc != EOK) {
                 return rc;