summaryrefslogtreecommitdiff
path: root/src/pkg/os
diff options
context:
space:
mode:
Diffstat (limited to 'src/pkg/os')
-rw-r--r--src/pkg/os/env.go2
-rw-r--r--src/pkg/os/exec.go4
-rw-r--r--src/pkg/os/getwd.go4
-rw-r--r--src/pkg/os/os_test.go14
-rw-r--r--src/pkg/os/path.go2
-rw-r--r--src/pkg/os/path_test.go16
6 files changed, 21 insertions, 21 deletions
diff --git a/src/pkg/os/env.go b/src/pkg/os/env.go
index b867cb564..04d759128 100644
--- a/src/pkg/os/env.go
+++ b/src/pkg/os/env.go
@@ -18,7 +18,7 @@ var env map[string] string;
func copyenv() {
env = make(map[string] string);
- for i, s := range Envs {
+ for _, s := range Envs {
for j := 0; j < len(s); j++ {
if s[j] == '=' {
env[s[0:j]] = s[j+1:len(s)];
diff --git a/src/pkg/os/exec.go b/src/pkg/os/exec.go
index 3a305243c..d183e0a16 100644
--- a/src/pkg/os/exec.go
+++ b/src/pkg/os/exec.go
@@ -148,12 +148,12 @@ func (w Waitmsg) String() string {
// Getpid returns the process id of the caller.
func Getpid() int {
- p, r2, e := syscall.Syscall(syscall.SYS_GETPID, 0, 0, 0);
+ p, _, _ := syscall.Syscall(syscall.SYS_GETPID, 0, 0, 0);
return int(p)
}
// Getppid returns the process id of the caller's parent.
func Getppid() int {
- p, r2, e := syscall.Syscall(syscall.SYS_GETPPID, 0, 0, 0);
+ p, _, _ := syscall.Syscall(syscall.SYS_GETPPID, 0, 0, 0);
return int(p)
}
diff --git a/src/pkg/os/getwd.go b/src/pkg/os/getwd.go
index 081f5e46a..e23f74df0 100644
--- a/src/pkg/os/getwd.go
+++ b/src/pkg/os/getwd.go
@@ -65,8 +65,8 @@ func Getwd() (string, Error) {
fd.Close();
return "", err;
}
- for i, name := range names {
- d, err := Lstat(parent + "/" + name);
+ for _, name := range names {
+ d, _ := Lstat(parent + "/" + name);
if d.Dev == dot.Dev && d.Ino == dot.Ino {
pwd = "/" + name + pwd;
goto Found;
diff --git a/src/pkg/os/os_test.go b/src/pkg/os/os_test.go
index 9f7df2ac5..c9131607a 100644
--- a/src/pkg/os/os_test.go
+++ b/src/pkg/os/os_test.go
@@ -110,9 +110,9 @@ func testReaddirnames(dir string, contents []string, t *testing.T) {
if err2 != nil {
t.Fatalf("readdirnames %q failed: %v", err2);
}
- for i, m := range contents {
+ for _, m := range contents {
found := false;
- for j, n := range s {
+ for _, n := range s {
if n == "." || n == ".." {
t.Errorf("got %s in directory", n);
}
@@ -139,9 +139,9 @@ func testReaddir(dir string, contents []string, t *testing.T) {
if err2 != nil {
t.Fatalf("readdir %q failed: %v", dir, err2);
}
- for i, m := range contents {
+ for _, m := range contents {
found := false;
- for j, n := range s {
+ for _, n := range s {
if m == n.Name {
if found {
t.Error("present twice:", m);
@@ -412,7 +412,7 @@ func TestChown(t *testing.T) {
t.Fatalf("getgroups: %s", err);
}
t.Log("groups: ", groups);
- for i, g := range groups {
+ for _, g := range groups {
if err = Chown(Path, -1, g); err != nil {
t.Fatalf("chown %s -1 %d: %s", Path, g, err);
}
@@ -468,7 +468,7 @@ func TestChdirAndGetwd(t *testing.T) {
// (unlike, say, /var, /etc, and /tmp).
dirs := []string{ "/bin", "/", "/usr/bin" };
for mode := 0; mode < 2; mode++ {
- for i, d := range dirs {
+ for _, d := range dirs {
if mode == 0 {
err = Chdir(d);
} else {
@@ -577,7 +577,7 @@ var openErrorTests = []openErrorTest {
}
func TestOpenError(t *testing.T) {
- for i, tt := range openErrorTests {
+ for _, tt := range openErrorTests {
f, err := Open(tt.path, tt.mode, 0);
if err == nil {
t.Errorf("Open(%q, %d) succeeded", tt.path, tt.mode);
diff --git a/src/pkg/os/path.go b/src/pkg/os/path.go
index a1718b5a3..ca157e50c 100644
--- a/src/pkg/os/path.go
+++ b/src/pkg/os/path.go
@@ -90,7 +90,7 @@ func RemoveAll(path string) Error {
err = nil;
for {
names, err1 := fd.Readdirnames(100);
- for i, name := range names {
+ for _, name := range names {
err1 := RemoveAll(path + "/" + name);
if err == nil {
err = err1;
diff --git a/src/pkg/os/path_test.go b/src/pkg/os/path_test.go
index 2790d9893..d7f595711 100644
--- a/src/pkg/os/path_test.go
+++ b/src/pkg/os/path_test.go
@@ -26,7 +26,7 @@ func TestMkdirAll(t *testing.T) {
// Make file.
fpath := path + "/file";
- fd, err := Open(fpath, O_WRONLY | O_CREAT, 0666);
+ _, err = Open(fpath, O_WRONLY | O_CREAT, 0666);
if err != nil {
t.Fatalf("create %q: %s", fpath, err);
}
@@ -79,7 +79,7 @@ func TestRemoveAll(t *testing.T) {
if err = RemoveAll(path); err != nil {
t.Fatalf("RemoveAll %q (first): %s", path, err);
}
- if dir, err := Lstat(path); err == nil {
+ if _, err := Lstat(path); err == nil {
t.Fatalf("Lstat %q succeeded after RemoveAll (first)", path);
}
@@ -100,7 +100,7 @@ func TestRemoveAll(t *testing.T) {
if err = RemoveAll(path); err != nil {
t.Fatalf("RemoveAll %q (second): %s", path, err);
}
- if dir, err := Lstat(path); err == nil {
+ if _, err := Lstat(path); err == nil {
t.Fatalf("Lstat %q succeeded after RemoveAll (second)", path);
}
@@ -109,7 +109,7 @@ func TestRemoveAll(t *testing.T) {
t.Fatalf("MkdirAll %q: %s", dpath, err);
}
- for i, s := range []string{fpath, dpath+"/file1", path+"/zzz"} {
+ for _, s := range []string{fpath, dpath+"/file1", path+"/zzz"} {
fd, err = Open(s, O_WRONLY | O_CREAT, 0666);
if err != nil {
t.Fatalf("create %q: %s", s, err);
@@ -120,7 +120,7 @@ func TestRemoveAll(t *testing.T) {
t.Fatalf("Chmod %q 0: %s", dpath, err);
}
if err = RemoveAll(path); err == nil {
- dir, err := Lstat(path);
+ _, err := Lstat(path);
if err == nil {
t.Errorf("Can lstat %q after supposed RemoveAll", path);
}
@@ -136,15 +136,15 @@ func TestRemoveAll(t *testing.T) {
if err = Chmod(dpath, 0777); err != nil {
t.Fatalf("Chmod %q 0777: %s", dpath, err);
}
- for i, s := range []string{fpath, path+"/zzz"} {
- if dir, err := Lstat(s); err == nil {
+ for _, s := range []string{fpath, path+"/zzz"} {
+ if _, err := Lstat(s); err == nil {
t.Fatalf("Lstat %q succeeded after partial RemoveAll", s);
}
}
if err = RemoveAll(path); err != nil {
t.Fatalf("RemoveAll %q after partial RemoveAll: %s", path, err);
}
- if dir, err := Lstat(path); err == nil {
+ if _, err := Lstat(path); err == nil {
t.Fatalf("Lstat %q succeeded after RemoveAll (final)", path);
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-29 21:34:24 +0000