[mynewt-mcumgr] 41/42: Remove base64 library.
This is an automated email from the ASF dual-hosted git repository.
ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-mcumgr.git
commit 2410e54fb63715c22a9657e0c236e4f4d297239c
Author: Christopher Collins
AuthorDate: Fri Feb 9 13:59:49 2018 -0800
Remove base64 library.
The application code is expected to provide its own base64 library.
---
CMakeLists.txt | 2 -
ext/CMakeLists.txt | 1 -
ext/base64/CMakeLists.txt| 17 ---
ext/base64/include/base64/base64.h | 40 ---
ext/base64/include/base64/hex.h | 33 --
ext/base64/pkg.yml | 26 -
ext/base64/src/base64.c | 181 ---
ext/base64/src/hex.c | 101 -
ext/base64/test/pkg.yml | 30 -
ext/base64/test/src/encoding_test.c | 53 -
ext/base64/test/src/encoding_test_priv.h | 38 ---
ext/base64/test/src/testcases/hex2str.c | 64 ---
ext/base64/test/src/testcases/str2hex.c | 72
samples/smp_svr/zephyr/CMakeLists.txt| 1 +
14 files changed, 1 insertion(+), 658 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4225f3e..b88b4ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,6 @@ add_library(MCUMGR INTERFACE)
zephyr_library()
add_subdirectory(cborattr)
add_subdirectory(cmd)
-add_subdirectory(ext)
add_subdirectory(mgmt)
add_subdirectory(smp)
@@ -11,6 +10,5 @@ zephyr_library_link_libraries(MCUMGR)
target_link_libraries(MCUMGR INTERFACE
zephyr_interface
- BASE64
TINYCBOR
)
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
deleted file mode 100644
index f453a03..000
--- a/ext/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(base64)
diff --git a/ext/base64/CMakeLists.txt b/ext/base64/CMakeLists.txt
deleted file mode 100644
index 101985e..000
--- a/ext/base64/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-add_library(BASE64 INTERFACE)
-
-target_include_directories(BASE64 INTERFACE src)
-
-zephyr_library()
-target_include_directories(BASE64 INTERFACE
-include
-port/zephyr/include
-)
-
-zephyr_library_sources(
-src/base64.c
-src/hex.c
-)
-
-zephyr_library_link_libraries(BASE64)
-target_link_libraries(BASE64 INTERFACE zephyr_interface)
diff --git a/ext/base64/include/base64/base64.h
b/ext/base64/include/base64/base64.h
deleted file mode 100644
index 53c4853..000
--- a/ext/base64/include/base64/base64.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef __UTIL_BASE64_H
-#define __UTIL_BASE64_H
-
-#include
-#include
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int base64_encode(const void *, int, char *, uint8_t);
-int base64_decode(const char *, void *buf);
-int base64_pad(char *, int);
-int base64_decode_len(const char *str);
-
-#define BASE64_ENCODE_SIZE(__size) (__size) - 1) / 3) * 4) + 4)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __UTIL_BASE64_H__ */
diff --git a/ext/base64/include/base64/hex.h b/ext/base64/include/base64/hex.h
deleted file mode 100644
index 8ebae77..000
--- a/ext/base64/include/base64/hex.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef _UTIL_HEX_H_
-#define _UTIL_HEX_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-char
[mynewt-mcumgr] 41/42: Remove base64 library.
This is an automated email from the ASF dual-hosted git repository.
ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-mcumgr.git
commit 785fe1a7680605755753f9cc97405d345c6ded0e
Author: Christopher Collins
AuthorDate: Fri Feb 9 13:59:49 2018 -0800
Remove base64 library.
The application code is expected to provide its own base64 library.
---
CMakeLists.txt | 2 -
ext/CMakeLists.txt | 1 -
ext/base64/CMakeLists.txt| 17 ---
ext/base64/include/base64/base64.h | 40 ---
ext/base64/include/base64/hex.h | 33 --
ext/base64/pkg.yml | 26 -
ext/base64/src/base64.c | 181 ---
ext/base64/src/hex.c | 101 -
ext/base64/test/pkg.yml | 30 -
ext/base64/test/src/encoding_test.c | 53 -
ext/base64/test/src/encoding_test_priv.h | 38 ---
ext/base64/test/src/testcases/hex2str.c | 64 ---
ext/base64/test/src/testcases/str2hex.c | 72
samples/smp_svr/zephyr/CMakeLists.txt| 1 +
14 files changed, 1 insertion(+), 658 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4225f3e..b88b4ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,6 @@ add_library(MCUMGR INTERFACE)
zephyr_library()
add_subdirectory(cborattr)
add_subdirectory(cmd)
-add_subdirectory(ext)
add_subdirectory(mgmt)
add_subdirectory(smp)
@@ -11,6 +10,5 @@ zephyr_library_link_libraries(MCUMGR)
target_link_libraries(MCUMGR INTERFACE
zephyr_interface
- BASE64
TINYCBOR
)
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
deleted file mode 100644
index f453a03..000
--- a/ext/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(base64)
diff --git a/ext/base64/CMakeLists.txt b/ext/base64/CMakeLists.txt
deleted file mode 100644
index 101985e..000
--- a/ext/base64/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-add_library(BASE64 INTERFACE)
-
-target_include_directories(BASE64 INTERFACE src)
-
-zephyr_library()
-target_include_directories(BASE64 INTERFACE
-include
-port/zephyr/include
-)
-
-zephyr_library_sources(
-src/base64.c
-src/hex.c
-)
-
-zephyr_library_link_libraries(BASE64)
-target_link_libraries(BASE64 INTERFACE zephyr_interface)
diff --git a/ext/base64/include/base64/base64.h
b/ext/base64/include/base64/base64.h
deleted file mode 100644
index 53c4853..000
--- a/ext/base64/include/base64/base64.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef __UTIL_BASE64_H
-#define __UTIL_BASE64_H
-
-#include
-#include
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int base64_encode(const void *, int, char *, uint8_t);
-int base64_decode(const char *, void *buf);
-int base64_pad(char *, int);
-int base64_decode_len(const char *str);
-
-#define BASE64_ENCODE_SIZE(__size) (__size) - 1) / 3) * 4) + 4)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __UTIL_BASE64_H__ */
diff --git a/ext/base64/include/base64/hex.h b/ext/base64/include/base64/hex.h
deleted file mode 100644
index 8ebae77..000
--- a/ext/base64/include/base64/hex.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef _UTIL_HEX_H_
-#define _UTIL_HEX_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-char
