Fix compile errors: filepath shadow and struct field names

Author: Dylan-M

process/process_aix.go

@@ -124,7 +124,7 @@ type PrSiginfo64 struct {
 	SiImm    int32     // immediate data
 	SiStatus int32     // exit value or signal
 	Pad1     uint32    // reserved for future use
-	SiUid    uint64    // real user id of sending process
+	SiUID    uint64    // real user id of sending process
 	SiPid    uint64    // sending process id
 	SiAddr   prptr64   // address of faulting instruction
 	SiBand   int64     // band event for SIGPOLL
@@ -250,8 +250,8 @@ type AIXPSInfo struct {
 	Flag2  uint32         // process flags from proc struct p_flag2
 	Nlwp   uint32         // number of threads in process
 	Pad1   uint32         // reserved for future use
-	Uid    uint64         // real user id
-	Euid   uint64         // effective user id
+	UID    uint64         // real user id
+	EUID   uint64         // effective user id
 	Gid    uint64         // real group id
 	Egid   uint64         // effective group id
 	Pid    uint64         // unique process id
@@ -402,7 +402,7 @@ func (p *Process) StatusWithContext(ctx context.Context) ([]string, error) {
 	return []string{p.status}, nil
 }
 
-func (p *Process) ForegroundWithContext(ctx context.Context) (bool, error) {
+func (p *Process) ForegroundWithContext(_ context.Context) (bool, error) {
 	return false, common.ErrNotImplementedError
 }
 
@@ -460,7 +460,7 @@ func (p *Process) NiceWithContext(ctx context.Context) (int32, error) {
 	return nice, nil
 }
 
-func (p *Process) IOniceWithContext(ctx context.Context) (int32, error) {
+func (p *Process) IOniceWithContext(_ context.Context) (int32, error) {
 	return 0, common.ErrNotImplementedError
 }
 
@@ -510,7 +510,7 @@ func (p *Process) RlimitUsageWithContext(ctx context.Context, gatherUsed bool) (
 }
 
 // getRlimitFromUlimit gets resource limits via ulimit command
-func (p *Process) getRlimitFromUlimit(ctx context.Context, gatherUsed bool) ([]RlimitStat, error) {
+func (p *Process) getRlimitFromUlimit(ctx context.Context, _ bool) ([]RlimitStat, error) {
 	cmd := exec.CommandContext(ctx, "sh", "-c", "ulimit -a")
 	output, err := cmd.Output()
 	if err != nil {
@@ -600,7 +600,7 @@ func (p *Process) IOCountersWithContext(ctx context.Context) (*IOCountersStat, e
 	}, nil
 }
 
-func (p *Process) NumCtxSwitchesWithContext(ctx context.Context) (*NumCtxSwitchesStat, error) {
+func (p *Process) NumCtxSwitchesWithContext(_ context.Context) (*NumCtxSwitchesStat, error) {
 	// AIX ps doesn't have -Leo format. Try using -o format with THREAD output
 	// Fallback: Use ps -m to get thread info which includes context switch data in some AIX versions
 	// For now, return error as AIX doesn't expose this in standard ps
@@ -648,7 +648,7 @@ func (p *Process) TimesWithContext(ctx context.Context) (*cpu.TimesStat, error)
 	return cpuTimes, nil
 }
 
-func (p *Process) CPUAffinityWithContext(ctx context.Context) ([]int32, error) {
+func (p *Process) CPUAffinityWithContext(_ context.Context) ([]int32, error) {
 	// AIX ps command does not support psr field specifier in System V style
 	// Berkeley style ps doesn't provide CPU affinity information
 	// This metric is not available on AIX
@@ -679,7 +679,7 @@ func (p *Process) PageFaultsWithContext(ctx context.Context) (*PageFaultsStat, e
 	return pageFaults, nil
 }
 
-func (p *Process) ChildrenWithContext(ctx context.Context) ([]*Process, error) {
+func (p *Process) ChildrenWithContext(_ context.Context) ([]*Process, error) {
 	return nil, common.ErrNotImplementedError
 }
 
@@ -705,13 +705,13 @@ func (p *Process) ConnectionsMaxWithContext(ctx context.Context, maxConn int) ([
 }
 
 // getConnectionsUsingNetstat retrieves network connections using AIX netstat command.
-// DEPRECATED: Use net module's ConnectionsPidMaxWithContext instead
+// Deprecated: Use net module's ConnectionsPidMaxWithContext instead
 // This function is kept for backward compatibility but delegates to the net module
 func (p *Process) getConnectionsUsingNetstat(ctx context.Context, maxConn int) ([]net.ConnectionStat, error) {
 	return net.ConnectionsPidMaxWithContext(ctx, "all", p.Pid, maxConn)
 }
 
-func (p *Process) MemoryMapsWithContext(ctx context.Context, grouped bool) (*[]MemoryMapsStat, error) {
+func (p *Process) MemoryMapsWithContext(ctx context.Context, _ bool) (*[]MemoryMapsStat, error) {
 	// Use AIX procmap command to retrieve detailed memory address space maps
 	// procmap provides information about memory regions including HEAP, STACK, TEXT, etc.
 	pid := p.Pid
@@ -733,7 +733,7 @@ func (p *Process) MemoryMapsWithContext(ctx context.Context, grouped bool) (*[]M
 // 0                 10000000           262144K r--   m     KERTXT     10002
 // 10000000          1000ce95               51K r-x   s     MAINTEXT   8b8117           init
 // 200003d8          20036288              215K rw-   sm    MAINDATA   890192           init
-func (p *Process) parseMemoryMaps(output string) *[]MemoryMapsStat {
+func (_ *Process) parseMemoryMaps(output string) *[]MemoryMapsStat {
 	maps := make([]MemoryMapsStat, 0)
 	lines := strings.Split(output, "\n")
 
@@ -802,20 +802,22 @@ func parseSizeField(sizeStr string) uint64 {
 	sizeStr = strings.TrimSpace(sizeStr)
 
 	// Check for unit suffixes
-	if strings.HasSuffix(sizeStr, "K") || strings.HasSuffix(sizeStr, "k") {
+	if len(sizeStr) > 0 {
+		lastChar := strings.ToLower(string(sizeStr[len(sizeStr)-1]))
 		numStr := sizeStr[:len(sizeStr)-1]
-		if num, err := strconv.ParseUint(numStr, 10, 64); err == nil {
-			return num * 1024
-		}
-	} else if strings.HasSuffix(sizeStr, "M") || strings.HasSuffix(sizeStr, "m") {
-		numStr := sizeStr[:len(sizeStr)-1]
-		if num, err := strconv.ParseUint(numStr, 10, 64); err == nil {
-			return num * 1024 * 1024
-		}
-	} else if strings.HasSuffix(sizeStr, "G") || strings.HasSuffix(sizeStr, "g") {
-		numStr := sizeStr[:len(sizeStr)-1]
-		if num, err := strconv.ParseUint(numStr, 10, 64); err == nil {
-			return num * 1024 * 1024 * 1024
+		switch lastChar {
+		case "k":
+			if num, err := strconv.ParseUint(numStr, 10, 64); err == nil {
+				return num * 1024
+			}
+		case "m":
+			if num, err := strconv.ParseUint(numStr, 10, 64); err == nil {
+				return num * 1024 * 1024
+			}
+		case "g":
+			if num, err := strconv.ParseUint(numStr, 10, 64); err == nil {
+				return num * 1024 * 1024 * 1024
+			}
 		}
 	}
 
@@ -827,7 +829,7 @@ func parseSizeField(sizeStr string) uint64 {
 	return 0
 }
 
-func (p *Process) EnvironWithContext(ctx context.Context) ([]string, error) {
+func (p *Process) EnvironWithContext(_ context.Context) ([]string, error) {
 	// AIX /proc does not expose environment variables in a standard text format
 	// Envp in psinfo is a user-space pointer that is not directly accessible
 	return nil, common.ErrNotImplementedError
@@ -849,7 +851,7 @@ func limitToUint(val string) (uint64, error) {
 }
 
 // Get num_fds from /proc/(pid)/limits (not available in AIX)
-func (p *Process) fillFromLimitsWithContext(ctx context.Context) ([]RlimitStat, error) {
+func (p *Process) fillFromLimitsWithContext(_ context.Context) ([]RlimitStat, error) {
 	// AIX /proc does not expose resource limits in a standard procfs location
 	return nil, common.ErrNotImplementedError
 }
@@ -878,7 +880,7 @@ func (p *Process) fillFromfdWithContext(ctx context.Context) (int32, []*OpenFile
 	var openfiles []*OpenFilesStat
 	for _, fd := range fnames {
 		fpath := filepath.Join(statPath, fd)
-		filepath, err := os.Readlink(fpath)
+		linkPath, err := os.Readlink(fpath)
 		if err != nil {
 			continue
 		}
@@ -887,7 +889,7 @@ func (p *Process) fillFromfdWithContext(ctx context.Context) (int32, []*OpenFile
 			return numFDs, openfiles, err
 		}
 		o := &OpenFilesStat{
-			Path: filepath,
+			Path: linkPath,
 			Fd:   t,
 		}
 		openfiles = append(openfiles, o)
@@ -1271,7 +1273,7 @@ func (p *Process) fillFromStatusWithContext(ctx context.Context) error {
 		err = binary.Read(infoFile, binary.BigEndian, &aixPSinfo)
 		if err == nil {
 			// Extract UIDs: real UID, effective UID, saved UID (use effective as third), and fsuid (use effective)
-			p.uids = []uint32{uint32(aixPSinfo.Uid), uint32(aixPSinfo.Euid), uint32(aixPSinfo.Euid), uint32(aixPSinfo.Euid)}
+			p.uids = []uint32{uint32(aixPSinfo.UID), uint32(aixPSinfo.EUID), uint32(aixPSinfo.EUID), uint32(aixPSinfo.EUID)}
 			// Extract GIDs: real GID, effective GID, saved GID (use effective as third), and fsgid (use effective)
 			p.gids = []uint32{uint32(aixPSinfo.Gid), uint32(aixPSinfo.Egid), uint32(aixPSinfo.Egid), uint32(aixPSinfo.Egid)}
 			// Extract number of threads from Nlwp field