opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 09:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25839 from timesince/main

Browse Source 
chore: make function comment match function name
This commit is contained in:
openshift-merge-bot[bot]
2025-04-10 10:15:53 +00:00
committed by GitHub
parent 4aeca9cced 7cbad232fe
commit 526aa3aa48
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/common/create_opts.go
View File

@ -69,7 +69,7 @@ func LogDriver() string {
return "" return ""
} }
// DefineCreateDefault is used to initialize ctr create options before flag initialization // DefineCreateDefaults is used to initialize ctr create options before flag initialization
func DefineCreateDefaults(opts *entities.ContainerCreateOptions) { func DefineCreateDefaults(opts *entities.ContainerCreateOptions) {
opts.LogDriver = LogDriver() opts.LogDriver = LogDriver()
opts.CgroupsMode = cgroupConfig() opts.CgroupsMode = cgroupConfig()

2
cmd/podman/containers/ps.go
View File

@ -340,7 +340,7 @@ func (l psReporter) ImageID() string {
return l.ListContainer.ImageID return l.ListContainer.ImageID
} }
// Labels returns a map of the pod's labels // Label returns a map of the pod's labels
func (l psReporter) Label(name string) string { func (l psReporter) Label(name string) string {
return l.ListContainer.Labels[name] return l.ListContainer.Labels[name]
} }

2
cmd/podman/parse/net.go
View File

@ -28,7 +28,7 @@ var (
domainRegexp = regexp.Delayed(`^(:?(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]))(:?\.(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])))*)\.?\s*$`) domainRegexp = regexp.Delayed(`^(:?(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]))(:?\.(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])))*)\.?\s*$`)
) )
// validateExtraHost validates that the specified string is a valid extrahost and returns it. // ValidateExtraHost validates that the specified string is a valid extrahost and returns it.
// ExtraHost is in the form of name1;name2;name3:ip where the ip has to be a valid ip (ipv4 or ipv6) or the special string HostGateway. // ExtraHost is in the form of name1;name2;name3:ip where the ip has to be a valid ip (ipv4 or ipv6) or the special string HostGateway.
// for add-host flag // for add-host flag
func ValidateExtraHost(val string) (string, error) { func ValidateExtraHost(val string) (string, error) {

2
libpod/container_internal.go
View File

@ -136,7 +136,7 @@ func (c *Container) CheckpointPath() string {
return filepath.Join(c.bundlePath(), metadata.CheckpointDirectory) return filepath.Join(c.bundlePath(), metadata.CheckpointDirectory)
} }
// PreCheckpointPath returns the path to the directory containing the pre-checkpoint-images // PreCheckPointPath returns the path to the directory containing the pre-checkpoint-images
func (c *Container) PreCheckPointPath() string { func (c *Container) PreCheckPointPath() string {
return filepath.Join(c.bundlePath(), preCheckpointDir) return filepath.Join(c.bundlePath(), preCheckpointDir)
} }