Skip to content

Commit 2c95248

Browse files
committed
Fix warnings
1 parent c2e07e7 commit 2c95248

File tree

8 files changed

+29
-24
lines changed

8 files changed

+29
-24
lines changed

examples/advanced/errgrp/cmpwaitgroup/error_with_errgroup.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package cmpwaitgroup
22

33
import (
44
"fmt"
5+
"math/rand"
6+
"time"
57

68
"github.com/devlights/gomy/enumerable"
79
"github.com/devlights/gomy/output"
@@ -15,6 +17,7 @@ func ErrWithErrGroup() error {
1517
var (
1618
loopRange = enumerable.NewRange(1, 6)
1719
waitGrp = errgroup.Group{}
20+
rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
1821
)
1922

2023
// ----------------------------------------------------------------------------------------
@@ -36,7 +39,7 @@ func ErrWithErrGroup() error {
3639
output.Stderrl(prefix, "start")
3740
defer output.Stderrl(prefix, "end")
3841

39-
err := randomErr(prefix)
42+
err := randomErr(prefix, rnd)
4043
if err != nil {
4144
output.Stderrl(prefix, "\tERROR!!")
4245
}

examples/advanced/errgrp/cmpwaitgroup/error_with_waitgroup.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ import (
1010
"github.com/devlights/gomy/output"
1111
)
1212

13-
func init() {
14-
rand.Seed(time.Now().UnixNano())
15-
}
16-
1713
// ErrWithWaitGroup は、標準ライブラリ sync.WaitGroup でエラー情報を呼び元に伝播させるサンプルです.
1814
func ErrWithWaitGroup() error {
1915
var (
2016
loopRange = enumerable.NewRange(1, 6)
2117
waitGrp = sync.WaitGroup{}
2218
errorCh = make(chan error)
19+
rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
2320
)
2421

2522
// ----------------------------------------------------------------------------------------
@@ -37,7 +34,7 @@ func ErrWithWaitGroup() error {
3734
output.Stderrl(prefix, "start")
3835
defer output.Stderrl(prefix, "end")
3936

40-
err := randomErr(prefix)
37+
err := randomErr(prefix, rnd)
4138
if err != nil {
4239
output.Stderrl(prefix, "\tERROR!!")
4340
errorCh <- err
@@ -58,8 +55,8 @@ func ErrWithWaitGroup() error {
5855
return nil
5956
}
6057

61-
func randomErr(message string) error {
62-
i := rand.Intn(100)
58+
func randomErr(message string, rnd *rand.Rand) error {
59+
i := rnd.Intn(100)
6360
if i > 30 {
6461
return fmt.Errorf("randomErr [%d][%s]", i, message)
6562
}

examples/basic/bitop/bitflags.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ const (
2222
None = 0
2323
)
2424

25+
// ---------------------------------------
26+
// Vars
27+
// ---------------------------------------
28+
var (
29+
rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
30+
)
31+
2532
// ---------------------------------------
2633
// Types
2734
// ---------------------------------------
@@ -40,7 +47,7 @@ func (me producer) put(n int) context.Context {
4047
defer cxl()
4148
for i := 0; i < n; i++ {
4249
me <- i
43-
time.Sleep(time.Duration(rand.Intn(10)) * time.Millisecond)
50+
time.Sleep(time.Duration(rnd.Intn(10)) * time.Millisecond)
4451
}
4552
}()
4653
return ctx
@@ -52,7 +59,7 @@ func (me consumer) take(prefix string) context.Context {
5259
defer cxl()
5360
for v := range me {
5461
log.Printf("%s: %v\n", prefix, v)
55-
time.Sleep(time.Duration(rand.Intn(50)) * time.Millisecond)
62+
time.Sleep(time.Duration(rnd.Intn(50)) * time.Millisecond)
5663
}
5764
}()
5865
return ctx
@@ -127,7 +134,6 @@ func (me reporter) start() context.Context {
127134
// BitFlags -- ビットフラグのサンプルです.
128135
func BitFlags() error {
129136
log.SetFlags(0)
130-
rand.Seed(time.Now().Unix())
131137

132138
// initialize jobs
133139
var (

examples/basic/loops/for_loop_copy_value.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func ForLoopCopyValue() error {
1919
for _, v := range accs {
2020
fmt.Printf("%v", v)
2121
}
22-
fmt.Println("")
22+
fmt.Println("")
2323
}
2424
)
2525

examples/basic/unsafes/unsafe_sizeof.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ func Sizeof() error {
4444
},
4545
}
4646

47+
fmt.Println("mem", m)
48+
4749
fmt.Println("bool", unsafe.Sizeof(m.b))
4850
fmt.Println("int", unsafe.Sizeof(m.i))
4951
fmt.Println("int16", unsafe.Sizeof(m.i16))
@@ -57,5 +59,6 @@ func Sizeof() error {
5759

5860
fmt.Println("----")
5961
fmt.Println("mem", unsafe.Sizeof(m))
62+
6063
return nil
6164
}

examples/gotour/gotour10/tutorial_gotour_10_if.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ func If() error {
2323
// if err := xxxx(); err != nil {
2424
// }
2525
// ------------------------------------------------------------
26-
rand.Seed(time.Now().UnixNano())
27-
2826
var (
29-
i = rand.Intn(100)
27+
rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
28+
i = rnd.Intn(100)
3029
)
3130

3231
// 通常の if
@@ -41,7 +40,7 @@ func If() error {
4140
// ステートメント付きの if
4241
// ifの条件部で宣言した変数は if ブロックの中で使えるし
4342
// elseブロックの中でも見える
44-
if i2 := rand.Intn(100); i2 < 80 {
43+
if i2 := rnd.Intn(100); i2 < 80 {
4544
fmt.Println("< 80")
4645
} else {
4746
fmt.Println("> 80")

examples/gotour/gotour11/tutorial_gotour_11_switch.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ func Switch() error {
2121
// - 条件部を 指定しない switch は、 switch true {} と書いてるのと同じ
2222
// - if-then-else を長くかくより、 switch {} を使うほうがシンプルに表現できる.
2323
// ------------------------------------------------------------
24-
rand.Seed(time.Now().UnixNano())
2524
var (
26-
i = rand.Intn(6)
27-
f = func() int {
25+
rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
26+
i = rnd.Intn(6)
27+
f = func() int {
2828
return 3
2929
}
3030
)

examples/socket/tcp_02_twoway_recvside_close/client/main.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ var (
3939
appLog = log.New(os.Stderr, "[client] ", log.Ltime|log.Lmicroseconds)
4040
)
4141

42-
func init() {
43-
rand.Seed(time.Now().UnixNano())
44-
}
45-
4642
func exitOnErr(err error) {
4743
if err != nil {
4844
if err != io.EOF {
@@ -73,7 +69,8 @@ func main() {
7369
// (1) length: uint32 (4-bytes)
7470
// (2) data : string (variable)
7571
var (
76-
message = items[rand.Intn(len(items))]
72+
rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
73+
message = items[rnd.Intn(len(items))]
7774
length = make([]byte, 4)
7875
buf = new(bytes.Buffer)
7976
)

0 commit comments

Comments
 (0)