Skip to content

Commit

Permalink
Merge pull request #22299 from lvyaoting/main
Browse files Browse the repository at this point in the history
[CI:DOCS] chore: fix function names in comment
  • Loading branch information
openshift-merge-bot[bot] authored Apr 9, 2024
2 parents 52e1d38 + 59ee130 commit 6f4b1c1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmd/podman/containers/ps.go
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ func (l psReporter) CreatedAt() string {
return l.Created.String()
}

// CreateHuman allows us to output the created time in human readable format
// CreatedHuman allows us to output the created time in human readable format
func (l psReporter) CreatedHuman() string {
return units.HumanDuration(time.Since(l.Created)) + " ago"
}
Expand Down
2 changes: 1 addition & 1 deletion libpod/boltdb_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -1469,7 +1469,7 @@ func (s *BoltState) GetContainerExitCodeTimeStamp(id string) (*time.Time, error)
})
}

// PruneExitCodes removes exit codes older than 5 minutes unless the associated
// PruneContainerExitCodes removes exit codes older than 5 minutes unless the associated
// container still exists.
func (s *BoltState) PruneContainerExitCodes() error {
if !s.valid {
Expand Down
2 changes: 1 addition & 1 deletion libpod/container_internal.go
Original file line number Diff line number Diff line change
Expand Up @@ -2482,7 +2482,7 @@ func (c *Container) hasNamespace(namespace spec.LinuxNamespaceType) bool {
return false
}

// extractSecretToStorage copies a secret's data from the secrets manager to the container's static dir
// extractSecretToCtrStorage copies a secret's data from the secrets manager to the container's static dir
func (c *Container) extractSecretToCtrStorage(secr *ContainerSecret) error {
manager, err := c.runtime.SecretsManager()
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions libpod/container_path_resolution.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func (c *Container) pathAbs(path string) string {
return path
}

// resolveContainerPaths resolves the container's mount point and the container
// resolvePath resolves the container's mount point and the container
// path as specified by the user. Both may resolve to paths outside of the
// container's mount point when the container path hits a volume or bind mount.
//
Expand Down Expand Up @@ -153,7 +153,7 @@ func isPathOnVolume(c *Container, containerPath string) bool {
return false
}

// findBindMounts checks if the specified containerPath matches the destination
// findBindMount checks if the specified containerPath matches the destination
// path of a Mount. Returns a matching Mount or nil.
func findBindMount(c *Container, containerPath string) *specs.Mount {
cleanedPath := filepath.Clean(containerPath)
Expand Down

0 comments on commit 6f4b1c1

Please sign in to comment.