diff --git a/cmd/lshid/fmt.go b/cmd/lshid/fmt.go deleted file mode 100644 index 5c8576a..0000000 --- a/cmd/lshid/fmt.go +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) 2023 Steven Stallion -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND -// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -// OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -// SUCH DAMAGE. - -package main - -import ( - "fmt" - "strings" -) - -func fmtRelease(n uint16) string { - if n == 0 { - return "(empty)" - } - return fmt.Sprintf("%#04x (%x.%x)", n, n>>8, n&0xff) -} - -func fmtString(s string) string { - if s == "" { - return "(empty)" - } - return strings.TrimSpace(s) -} diff --git a/cmd/lshid/main.go b/cmd/lshid/main.go index 9729878..230467b 100644 --- a/cmd/lshid/main.go +++ b/cmd/lshid/main.go @@ -28,6 +28,7 @@ import ( "flag" "fmt" "os" + "strings" "github.com/sstallion/go-hid" "github.com/sstallion/go-tools/util" @@ -49,6 +50,21 @@ var ( pidFlag uint ) +func fmtRelease(n uint16) string { + if n == 0 { + return "(empty)" + } + return fmt.Sprintf("%#04x (%x.%x)", n, n>>8, n&0xff) +} + +func fmtString(s string) string { + s = strings.TrimSpace(s) + if s == "" { + return "(empty)" + } + return s +} + func usage() { util.PrintGlobalUsage(` Lshid lists HID devices attached to the system.