Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed typos #106

Merged
merged 1 commit into from
Feb 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion streams/follow.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions theme/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const (

var theme *viper.Viper

// MakeColorSafe extends gowid's MakeColorSafe function, prefering to interpret
// MakeColorSafe extends gowid's MakeColorSafe function, preferring to interpret
// its string argument as a toml file config key lookup first; if this fails, then
// fall back to gowid.MakeColorSafe, which will then read colors as urwid color names,
// #-prefixed hex digits, grayscales, etc.
Expand Down Expand Up @@ -88,7 +88,7 @@ func (m Mode) String() string {

// Load will set the package-level theme object to a viper object representing the
// toml file either (a) read from disk, or failing that (b) built-in to termshark.
// Disk themes are prefered and take precedence.
// Disk themes are preferred and take precedence.
func Load(name string, app gowid.IApp) error {
var err error

Expand Down
6 changes: 3 additions & 3 deletions ui/ui.go
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ func makeStructNodeWidget(pos tree.IPos, tr tree.IModel) gowid.IWidget {

//======================================================================

// I want to have prefered position work on this, but you have to choose a subwidget
// I want to have preferred position work on this, but you have to choose a subwidget
// to navigate to. We have three. I know that my use of them is very similar, so I'll
// just pick the first
type selectedComposite struct {
Expand Down Expand Up @@ -645,7 +645,7 @@ func (t *rowFocusTableWidget) At(lpos list.IWalkerPosition) gowid.IWidget {
return nil
}

// Composite so it passes through prefered column
// Composite so it passes through preferred column
var res gowid.IWidget = &selectedComposite{
Widget: isselected.New(w,
styled.New(w, gowid.MakePaletteRef(t.rowSelected)),
Expand Down Expand Up @@ -2246,7 +2246,7 @@ func getStructWidgetToDisplay(row int, app gowid.IApp) gowid.IWidget {

// if not nil, it means the user has interacted with some struct widget at least once causing
// a focus change. We track the current focus e.g. [0, 2, 1] - the indices through the tree leading
// to the focused item. We programatically adjust the focus widget of the new struct (e.g. after
// to the focused item. We programmatically adjust the focus widget of the new struct (e.g. after
// navigating down one in the packet list), but only if we can move focus to the same PDML field
// as the old struct. For example, if we are on tcp.srcport in the old packet, and we can
// open up tcp.srcport in the new packet, then we do so. This is not perfect, because I use the old
Expand Down
2 changes: 1 addition & 1 deletion utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ func ConvertArgToTShark(arg string) (string, string, bool) {

var UnexpectedOutput = fmt.Errorf("Unexpected output")

// Use tshark's output, becauses the indices can then be used to select
// Use tshark's output, because the indices can then be used to select
// an interface to sniff on, and net.Interfaces returns the interfaces in
// a different order.
func Interfaces() (map[int][]string, error) {
Expand Down