You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/10/23 20:53:43 UTC
[2/2] incubator-mynewt-newt git commit: newt - revendor
newt - revendor
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/aab8b345
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/aab8b345
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/aab8b345
Branch: refs/heads/develop
Commit: aab8b345835557b2436dfdd5fdcd806bc032df74
Parents: 667f5e8
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Oct 18 18:07:38 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Sun Oct 23 13:47:39 2016 -0700
----------------------------------------------------------------------
newt/Godeps/Godeps.json | 16 +-
.../github.com/spf13/pflag/string_array.go | 3 +-
.../golang.org/x/sys/unix/syscall_linux.go | 18 +-
.../golang.org/x/sys/unix/zsyscall_linux_386.go | 6 +-
.../x/sys/unix/zsyscall_linux_amd64.go | 6 +-
.../golang.org/x/sys/unix/zsyscall_linux_arm.go | 6 +-
.../x/sys/unix/zsyscall_linux_arm64.go | 6 +-
.../x/sys/unix/zsyscall_linux_mips64.go | 6 +-
.../x/sys/unix/zsyscall_linux_mips64le.go | 6 +-
.../x/sys/unix/zsyscall_linux_ppc64.go | 6 +-
.../x/sys/unix/zsyscall_linux_ppc64le.go | 6 +-
newt/vendor/mynewt.apache.org/newt/DISCLAIMER | 8 -
newt/vendor/mynewt.apache.org/newt/LICENSE | 244 -------------------
newt/vendor/mynewt.apache.org/newt/NOTICE | 8 -
newt/vendor/mynewt.apache.org/newt/util/util.go | 8 +
util/util.go | 8 +
16 files changed, 56 insertions(+), 305 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/Godeps/Godeps.json
----------------------------------------------------------------------
diff --git a/newt/Godeps/Godeps.json b/newt/Godeps/Godeps.json
index c76eef7..e870c47 100644
--- a/newt/Godeps/Godeps.json
+++ b/newt/Godeps/Godeps.json
@@ -39,11 +39,11 @@
},
{
"ImportPath": "github.com/spf13/pflag",
- "Rev": "b83537d79690b75cac5e021b036ae16792bf0f20"
+ "Rev": "bf8481a6aebc13a8aab52e699ffe2e79771f5a3f"
},
{
"ImportPath": "golang.org/x/sys/unix",
- "Rev": "67f277b6fe017c42fc3b4a445edc999dd99edd58"
+ "Rev": "9bb9f0998d48b31547d975974935ae9b48c7a03c"
},
{
"ImportPath": "gopkg.in/fsnotify.v1",
@@ -52,18 +52,18 @@
},
{
"ImportPath": "mynewt.apache.org/newt/util",
- "Comment": "pre_sterly_refactor-43-g31d6944",
- "Rev": "31d69448a7b7f73feaa323392bd7f7a62931b6f8"
+ "Comment": "pre_sterly_refactor-77-gff4ef02",
+ "Rev": "ff4ef02818cd4fe0387f7314f3ba6a33cc247d5f"
},
{
"ImportPath": "mynewt.apache.org/newt/viper",
- "Comment": "pre_sterly_refactor-43-g31d6944",
- "Rev": "31d69448a7b7f73feaa323392bd7f7a62931b6f8"
+ "Comment": "pre_sterly_refactor-77-gff4ef02",
+ "Rev": "ff4ef02818cd4fe0387f7314f3ba6a33cc247d5f"
},
{
"ImportPath": "mynewt.apache.org/newt/yaml",
- "Comment": "pre_sterly_refactor-43-g31d6944",
- "Rev": "31d69448a7b7f73feaa323392bd7f7a62931b6f8"
+ "Comment": "pre_sterly_refactor-77-gff4ef02",
+ "Rev": "ff4ef02818cd4fe0387f7314f3ba6a33cc247d5f"
}
]
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/github.com/spf13/pflag/string_array.go
----------------------------------------------------------------------
diff --git a/newt/vendor/github.com/spf13/pflag/string_array.go b/newt/vendor/github.com/spf13/pflag/string_array.go
index f320f2e..93b4e43 100644
--- a/newt/vendor/github.com/spf13/pflag/string_array.go
+++ b/newt/vendor/github.com/spf13/pflag/string_array.go
@@ -2,7 +2,6 @@ package pflag
import (
"fmt"
- "strings"
)
var _ = fmt.Fprint
@@ -40,7 +39,7 @@ func (s *stringArrayValue) String() string {
}
func stringArrayConv(sval string) (interface{}, error) {
- sval = strings.Trim(sval, "[]")
+ sval = sval[1 : len(sval)-1]
// An empty string would cause a array with one (empty) string
if len(sval) == 0 {
return []string{}, nil
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/golang.org/x/sys/unix/syscall_linux.go
----------------------------------------------------------------------
diff --git a/newt/vendor/golang.org/x/sys/unix/syscall_linux.go b/newt/vendor/golang.org/x/sys/unix/syscall_linux.go
index 46ace86..cfac4a4 100644
--- a/newt/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/newt/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -69,10 +69,10 @@ func Ppoll(fds []PollFd, timeout *Timespec, sigmask *Sigset_t) (n int, err error
return ppoll(&fds[0], len(fds), timeout, sigmask)
}
-//sys readlinkat(dirfd int, path string, buf []byte) (n int, err error)
+//sys Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
func Readlink(path string, buf []byte) (n int, err error) {
- return readlinkat(AT_FDCWD, path, buf)
+ return Readlinkat(AT_FDCWD, path, buf)
}
func Rename(oldpath string, newpath string) (err error) {
@@ -80,24 +80,20 @@ func Rename(oldpath string, newpath string) (err error) {
}
func Rmdir(path string) error {
- return unlinkat(AT_FDCWD, path, AT_REMOVEDIR)
+ return Unlinkat(AT_FDCWD, path, AT_REMOVEDIR)
}
-//sys symlinkat(oldpath string, newdirfd int, newpath string) (err error)
+//sys Symlinkat(oldpath string, newdirfd int, newpath string) (err error)
func Symlink(oldpath string, newpath string) (err error) {
- return symlinkat(oldpath, AT_FDCWD, newpath)
+ return Symlinkat(oldpath, AT_FDCWD, newpath)
}
func Unlink(path string) error {
- return unlinkat(AT_FDCWD, path, 0)
+ return Unlinkat(AT_FDCWD, path, 0)
}
-//sys unlinkat(dirfd int, path string, flags int) (err error)
-
-func Unlinkat(dirfd int, path string, flags int) error {
- return unlinkat(dirfd, path, flags)
-}
+//sys Unlinkat(dirfd int, path string, flags int) (err error)
//sys utimes(path string, times *[2]Timeval) (err error)
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
----------------------------------------------------------------------
diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
index 1f7a756..80f6a1b 100644
--- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
+++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
----------------------------------------------------------------------
diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
index b4e24fc..078c8f0 100644
--- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
+++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
----------------------------------------------------------------------
diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
index 20bf33c..76e5f7c 100644
--- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
+++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
----------------------------------------------------------------------
diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
index c7286db..72b7947 100644
--- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
+++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
----------------------------------------------------------------------
diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
index b709ed2..ba55509 100644
--- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
+++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
----------------------------------------------------------------------
diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
index 5cb1c56..2b1cc84 100644
--- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
+++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
----------------------------------------------------------------------
diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
index 873bb18..25f39db 100644
--- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
+++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
----------------------------------------------------------------------
diff --git a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
index bf08835..70702b5 100644
--- a/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
+++ b/newt/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
@@ -64,7 +64,7 @@ func ppoll(fds *PollFd, nfds int, timeout *Timespec, sigmask *Sigset_t) (n int,
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
@@ -87,7 +87,7 @@ func readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(oldpath)
if err != nil {
@@ -109,7 +109,7 @@ func symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-func unlinkat(dirfd int, path string, flags int) (err error) {
+func Unlinkat(dirfd int, path string, flags int) (err error) {
var _p0 *byte
_p0, err = BytePtrFromString(path)
if err != nil {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/mynewt.apache.org/newt/DISCLAIMER
----------------------------------------------------------------------
diff --git a/newt/vendor/mynewt.apache.org/newt/DISCLAIMER b/newt/vendor/mynewt.apache.org/newt/DISCLAIMER
deleted file mode 100644
index 1600825..0000000
--- a/newt/vendor/mynewt.apache.org/newt/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Mynewt is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Incubator PMC. Incubation is
-required of all newly accepted projects until a further review indicates
-that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF
-projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project
-has yet to be fully endorsed by the ASF.
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/mynewt.apache.org/newt/LICENSE
----------------------------------------------------------------------
diff --git a/newt/vendor/mynewt.apache.org/newt/LICENSE b/newt/vendor/mynewt.apache.org/newt/LICENSE
deleted file mode 100644
index 88a6f68..0000000
--- a/newt/vendor/mynewt.apache.org/newt/LICENSE
+++ /dev/null
@@ -1,244 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright {yyyy} {name of copyright owner}
-
- Licensed 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.
-
-This product bundles pretty, which is available under the MIT license. For
-details, see newt/vendor/github.com/kr/pretty/License
-
-This product bundles kr/text, which is available under the MIT license. For
-details, see newt/vendor/github.com/kr/text/License
-
-This product bundles mapstructure, which is available under the MIT license.
-For details, see newt/vendor/github.com/mitchellh/mapstructure/LICENSE
-
-This product bundles logrus, which is available under the MIT license. For
-details, see newt/vendor/github.com/Sirupsen/logrus/LICENSE
-
-This product bundles Cast, which is available under the MIT license. For
-details, see newt/vendor/github.com/spf13/cast/LICENSE
-
-This product bundles jWalterWeatherman, which is available under the MIT
-license. For details, see
-newt/vendor/github.com/spf13/jwalterweatherman/LICENSE
-
-This product bundles pflag, which is available under the "3-clause BSD"
-license. For details, see newt/vendor/github.com/spf13/pflag/LICENSE
-
-This product bundles the unix Go package, which is available under the
-"3-clause BSD" license. For details, see newt/vendor/golang.org/x/sys/LICENSE
-
-This product bundles fsnotify.v1, which is available under the "3-clause BSD"
-license. For details, see newt/vendor/gopkg.in/fsnotify.v1/LICENSE
-
-This product bundles yaml.v2's Go port of libyaml, which is available under the
-MIT license. For details, see:
- * yaml/apic.go
- * yaml/emitterc.go
- * yaml/parserc.go
- * yaml/readerc.go
- * yaml/scannerc.go
- * yaml/writerc.go
- * yaml/yamlh.go
- * yaml/yamlprivateh.go
-
-This product bundles viper, which is available under the MIT license. For
-details, see:
- * viper/LICENSE
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/mynewt.apache.org/newt/NOTICE
----------------------------------------------------------------------
diff --git a/newt/vendor/mynewt.apache.org/newt/NOTICE b/newt/vendor/mynewt.apache.org/newt/NOTICE
deleted file mode 100644
index 94bea73..0000000
--- a/newt/vendor/mynewt.apache.org/newt/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Mynewt (incubating)
-Copyright 2015-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were developed at
-Runtime Inc, copyright 2015.
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/newt/vendor/mynewt.apache.org/newt/util/util.go
----------------------------------------------------------------------
diff --git a/newt/vendor/mynewt.apache.org/newt/util/util.go b/newt/vendor/mynewt.apache.org/newt/util/util.go
index d3bc931..fd79c1b 100644
--- a/newt/vendor/mynewt.apache.org/newt/util/util.go
+++ b/newt/vendor/mynewt.apache.org/newt/util/util.go
@@ -568,6 +568,14 @@ func CIdentifier(s string) string {
return s
}
+func IntMax(a, b int) int {
+ if a > b {
+ return a
+ } else {
+ return b
+ }
+}
+
func IntMin(a, b int) int {
if a < b {
return a
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/aab8b345/util/util.go
----------------------------------------------------------------------
diff --git a/util/util.go b/util/util.go
index d3bc931..fd79c1b 100644
--- a/util/util.go
+++ b/util/util.go
@@ -568,6 +568,14 @@ func CIdentifier(s string) string {
return s
}
+func IntMax(a, b int) int {
+ if a > b {
+ return a
+ } else {
+ return b
+ }
+}
+
func IntMin(a, b int) int {
if a < b {
return a