From ecc1d4580f9d0dc0983f00412593d2303d0d1dfd Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 7 Mar 2025 21:12:21 +0900 Subject: [PATCH] removed redundant endding semicolons --- Makefile | 2 +- client-ctl.go | 2 +- client.go | 2 +- cmd/logger.go | 8 ++++---- server-ctl.go | 2 +- server-peer.go | 4 ++-- server.go | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 900ea62..1c885fd 100644 --- a/Makefile +++ b/Makefile @@ -85,4 +85,4 @@ cmd/tls.key: cmd/rsa.key: openssl genrsa -traditional -out cmd/rsa.key 2048 -.PHONY: clean test +.PHONY: all clean test diff --git a/client-ctl.go b/client-ctl.go index 4a724b6..08ca96b 100644 --- a/client-ctl.go +++ b/client-ctl.go @@ -351,7 +351,7 @@ func (ctl *client_ctl_client_conns_id) ServeHTTP(w http.ResponseWriter, req *htt var r *ClientRoute var spla string = "" - r = cts.route_map[ri]; + r = cts.route_map[ri] if r.server_peer_listen_addr != nil { spla = r.server_peer_listen_addr.String() } jsp = append(jsp, json_out_client_route{ Id: r.Id, diff --git a/client.go b/client.go index 5debe5e..02427fe 100644 --- a/client.go +++ b/client.go @@ -1670,7 +1670,7 @@ func (c *Client) FindClientConnByIdStr(conn_id string) (*ClientConn, error) { conn_nid, err = strconv.ParseUint(conn_id, 10, int(unsafe.Sizeof(ConnId(0)) * 8)) if err != nil { - return nil, fmt.Errorf("invalid connection id %s - %s", conn_id, err.Error()); + return nil, fmt.Errorf("invalid connection id %s - %s", conn_id, err.Error()) //cts = c.FindClientConnByToken(conn_id) // if not numeric, attempt to use it as a token //if cts == nil { return nil, fmt.Errorf("non-existent connection token '%s'", conn_id) } } else { diff --git a/cmd/logger.go b/cmd/logger.go index 71f1766..5813e24 100644 --- a/cmd/logger.go +++ b/cmd/logger.go @@ -148,10 +148,10 @@ func (l *AppLogger) write(id string, level hodu.LogLevel, call_depth int, fmtstr now = time.Now() _, off_s = now.Zone() - off_m = off_s / 60; - off_h = off_m / 60; - off_m = off_m % 60; - if off_m < 0 { off_m = -off_m; } + off_m = off_s / 60 + off_h = off_m / 60 + off_m = off_m % 60 + if off_m < 0 { off_m = -off_m } sb.WriteString( fmt.Sprintf("%04d-%02d-%02d %02d:%02d:%02d %+03d%02d ", diff --git a/server-ctl.go b/server-ctl.go index c5c240d..0e64335 100644 --- a/server-ctl.go +++ b/server-ctl.go @@ -483,7 +483,7 @@ func (ctl *server_ctl_server_conns_id_routes_id_peers) ServeHTTP(w http.Response r.pts_mtx.Lock() for _, pi = range r.pts_map.get_sorted_keys() { var p *ServerPeerConn - p = r.pts_map[pi]; + p = r.pts_map[pi] jcp = append(jcp, json_out_server_peer{ Id: p.conn_id, ServerPeerAddr: p.conn.RemoteAddr().String(), diff --git a/server-peer.go b/server-peer.go index f80f7d0..bee5d7e 100644 --- a/server-peer.go +++ b/server-peer.go @@ -170,8 +170,8 @@ func (spc *ServerPeerConn) ReportEvent(event_type PACKET_KIND, event_data interf pd, ok = event_data.(*PeerDesc) if !ok { // something wrong. leave it unknown. - spc.client_peer_laddr = ""; - spc.client_peer_raddr = ""; + spc.client_peer_laddr = "" + spc.client_peer_raddr = "" } else { spc.client_peer_laddr = pd.LocalAddrStr spc.client_peer_raddr = pd.RemoteAddrStr diff --git a/server.go b/server.go index d372392..1352a57 100644 --- a/server.go +++ b/server.go @@ -1883,7 +1883,7 @@ func (s *Server) FindServerConnByIdStr(conn_id string) (*ServerConn, error) { conn_nid, err = strconv.ParseUint(conn_id, 10, int(unsafe.Sizeof(ConnId(0)) * 8)) if err != nil { - //return nil, fmt.Errorf("invalid connection id %s - %s", conn_id, err.Error()); + //return nil, fmt.Errorf("invalid connection id %s - %s", conn_id, err.Error()) cts = s.FindServerConnByClientToken(conn_id) // if not numeric, attempt to use it as a token if cts == nil { return nil, fmt.Errorf("non-existent connection token '%s'", conn_id) } } else {