From fc287c36e64b441aad574ff1ff6ada75ea726e47 Mon Sep 17 00:00:00 2001 From: Roger <61731332@qq.com> Date: Fri, 21 Feb 2020 21:48:26 +0800 Subject: [PATCH] replace zinx with github.com/aceld/zinx --- README.md | 6 +++--- examples/zinx_version_ex/ZinxV0.10Test/Client0.go | 2 +- examples/zinx_version_ex/ZinxV0.10Test/Client1.go | 2 +- examples/zinx_version_ex/ZinxV0.10Test/Server.go | 4 ++-- examples/zinx_version_ex/ZinxV0.11Test/Client0.go | 2 +- examples/zinx_version_ex/ZinxV0.11Test/Client1.go | 2 +- examples/zinx_version_ex/ZinxV0.11Test/Server.go | 6 +++--- examples/zinx_version_ex/ZinxV0.1Test/Server.go | 2 +- examples/zinx_version_ex/ZinxV0.2Test/Server.go | 2 +- examples/zinx_version_ex/ZinxV0.3Test/Server.go | 4 ++-- examples/zinx_version_ex/ZinxV0.4Test/Server.go | 4 ++-- examples/zinx_version_ex/ZinxV0.5Test/Client.go | 2 +- examples/zinx_version_ex/ZinxV0.5Test/Server.go | 4 ++-- examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client0.go | 2 +- examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client1.go | 2 +- examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Server.go | 4 ++-- examples/zinx_version_ex/ZinxV0.8Test/Client0.go | 2 +- examples/zinx_version_ex/ZinxV0.8Test/Client1.go | 2 +- examples/zinx_version_ex/ZinxV0.8Test/Server.go | 4 ++-- examples/zinx_version_ex/ZinxV0.9Test/Client0.go | 2 +- examples/zinx_version_ex/ZinxV0.9Test/Client1.go | 2 +- examples/zinx_version_ex/ZinxV0.9Test/Server.go | 4 ++-- examples/zinx_version_ex/datapackDemo/Client.go | 2 +- examples/zinx_version_ex/datapackDemo/Server.go | 2 +- examples/zinx_version_ex/protoDemo/main.go | 2 +- go.mod | 2 +- utils/globalobj.go | 4 ++-- zinx_app_demo/mmo_game/api/move.go | 8 ++++---- zinx_app_demo/mmo_game/api/world_chat.go | 8 ++++---- zinx_app_demo/mmo_game/client_AI_robot.go | 2 +- zinx_app_demo/mmo_game/core/player.go | 4 ++-- zinx_app_demo/mmo_game/server.go | 8 ++++---- znet/connection.go | 4 ++-- znet/connmanager.go | 2 +- znet/datapack.go | 4 ++-- znet/msghandler.go | 4 ++-- znet/request.go | 2 +- znet/router.go | 2 +- znet/server.go | 4 ++-- znet/server_test.go | 2 +- ztimer/delayfunc.go | 2 +- ztimer/timerscheduler.go | 2 +- ztimer/timerscheduler_test.go | 2 +- ztimer/timewheel.go | 2 +- 44 files changed, 70 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index 27fd261..137a90d 100644 --- a/README.md +++ b/README.md @@ -101,8 +101,8 @@ func main() { ```go import ( "fmt" - "zinx/ziface" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/znet" ) //ping test 自定义路由 @@ -133,7 +133,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.10Test/Client0.go b/examples/zinx_version_ex/ZinxV0.10Test/Client0.go index 073ef20..7cdb296 100644 --- a/examples/zinx_version_ex/ZinxV0.10Test/Client0.go +++ b/examples/zinx_version_ex/ZinxV0.10Test/Client0.go @@ -5,7 +5,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.10Test/Client1.go b/examples/zinx_version_ex/ZinxV0.10Test/Client1.go index bcd0f1c..6266634 100644 --- a/examples/zinx_version_ex/ZinxV0.10Test/Client1.go +++ b/examples/zinx_version_ex/ZinxV0.10Test/Client1.go @@ -5,7 +5,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.10Test/Server.go b/examples/zinx_version_ex/ZinxV0.10Test/Server.go index 09d1ddb..98a221d 100644 --- a/examples/zinx_version_ex/ZinxV0.10Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.10Test/Server.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "zinx/ziface" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.11Test/Client0.go b/examples/zinx_version_ex/ZinxV0.11Test/Client0.go index 073ef20..7cdb296 100644 --- a/examples/zinx_version_ex/ZinxV0.11Test/Client0.go +++ b/examples/zinx_version_ex/ZinxV0.11Test/Client0.go @@ -5,7 +5,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.11Test/Client1.go b/examples/zinx_version_ex/ZinxV0.11Test/Client1.go index bcd0f1c..6266634 100644 --- a/examples/zinx_version_ex/ZinxV0.11Test/Client1.go +++ b/examples/zinx_version_ex/ZinxV0.11Test/Client1.go @@ -5,7 +5,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.11Test/Server.go b/examples/zinx_version_ex/ZinxV0.11Test/Server.go index 71879e7..a6fc6ad 100644 --- a/examples/zinx_version_ex/ZinxV0.11Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.11Test/Server.go @@ -7,9 +7,9 @@ package main import ( - "zinx/ziface" - "zinx/zlog" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/zlog" + "github.com/aceld/zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.1Test/Server.go b/examples/zinx_version_ex/ZinxV0.1Test/Server.go index d1b26f3..4e54a68 100644 --- a/examples/zinx_version_ex/ZinxV0.1Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.1Test/Server.go @@ -1,7 +1,7 @@ package main import ( - "zinx/znet" + "github.com/aceld/zinx/znet" ) diff --git a/examples/zinx_version_ex/ZinxV0.2Test/Server.go b/examples/zinx_version_ex/ZinxV0.2Test/Server.go index d1b26f3..4e54a68 100644 --- a/examples/zinx_version_ex/ZinxV0.2Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.2Test/Server.go @@ -1,7 +1,7 @@ package main import ( - "zinx/znet" + "github.com/aceld/zinx/znet" ) diff --git a/examples/zinx_version_ex/ZinxV0.3Test/Server.go b/examples/zinx_version_ex/ZinxV0.3Test/Server.go index 0ea3b06..d601515 100644 --- a/examples/zinx_version_ex/ZinxV0.3Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.3Test/Server.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "zinx/ziface" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.4Test/Server.go b/examples/zinx_version_ex/ZinxV0.4Test/Server.go index e11aca1..9adb350 100644 --- a/examples/zinx_version_ex/ZinxV0.4Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.4Test/Server.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "zinx/ziface" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.5Test/Client.go b/examples/zinx_version_ex/ZinxV0.5Test/Client.go index 24037fe..95642a7 100644 --- a/examples/zinx_version_ex/ZinxV0.5Test/Client.go +++ b/examples/zinx_version_ex/ZinxV0.5Test/Client.go @@ -5,7 +5,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.5Test/Server.go b/examples/zinx_version_ex/ZinxV0.5Test/Server.go index 8f3bed3..712e44d 100644 --- a/examples/zinx_version_ex/ZinxV0.5Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.5Test/Server.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "zinx/ziface" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client0.go b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client0.go index 0ee27e9..d0827b1 100644 --- a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client0.go +++ b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client0.go @@ -5,7 +5,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client1.go b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client1.go index f88a175..fdac6fb 100644 --- a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client1.go +++ b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Client1.go @@ -5,7 +5,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Server.go b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Server.go index 0f3d974..a8e25c7 100644 --- a/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.6Test-V0.7Test/Server.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "zinx/ziface" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.8Test/Client0.go b/examples/zinx_version_ex/ZinxV0.8Test/Client0.go index 073ef20..7cdb296 100644 --- a/examples/zinx_version_ex/ZinxV0.8Test/Client0.go +++ b/examples/zinx_version_ex/ZinxV0.8Test/Client0.go @@ -5,7 +5,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.8Test/Client1.go b/examples/zinx_version_ex/ZinxV0.8Test/Client1.go index 81281ff..b34b7b9 100644 --- a/examples/zinx_version_ex/ZinxV0.8Test/Client1.go +++ b/examples/zinx_version_ex/ZinxV0.8Test/Client1.go @@ -5,7 +5,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.8Test/Server.go b/examples/zinx_version_ex/ZinxV0.8Test/Server.go index 0c14854..234a903 100644 --- a/examples/zinx_version_ex/ZinxV0.8Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.8Test/Server.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "zinx/ziface" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/ZinxV0.9Test/Client0.go b/examples/zinx_version_ex/ZinxV0.9Test/Client0.go index 073ef20..7cdb296 100644 --- a/examples/zinx_version_ex/ZinxV0.9Test/Client0.go +++ b/examples/zinx_version_ex/ZinxV0.9Test/Client0.go @@ -5,7 +5,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.9Test/Client1.go b/examples/zinx_version_ex/ZinxV0.9Test/Client1.go index bcd0f1c..6266634 100644 --- a/examples/zinx_version_ex/ZinxV0.9Test/Client1.go +++ b/examples/zinx_version_ex/ZinxV0.9Test/Client1.go @@ -5,7 +5,7 @@ import ( "io" "net" "time" - "zinx/znet" + "github.com/aceld/zinx/znet" ) /* diff --git a/examples/zinx_version_ex/ZinxV0.9Test/Server.go b/examples/zinx_version_ex/ZinxV0.9Test/Server.go index e0228e9..c8b4356 100644 --- a/examples/zinx_version_ex/ZinxV0.9Test/Server.go +++ b/examples/zinx_version_ex/ZinxV0.9Test/Server.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "zinx/ziface" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/znet" ) //ping test 自定义路由 diff --git a/examples/zinx_version_ex/datapackDemo/Client.go b/examples/zinx_version_ex/datapackDemo/Client.go index 6456019..9d24723 100644 --- a/examples/zinx_version_ex/datapackDemo/Client.go +++ b/examples/zinx_version_ex/datapackDemo/Client.go @@ -3,7 +3,7 @@ package main import ( "fmt" "net" - "zinx/znet" + "github.com/aceld/zinx/znet" ) func main() { diff --git a/examples/zinx_version_ex/datapackDemo/Server.go b/examples/zinx_version_ex/datapackDemo/Server.go index 3705adb..a4acc31 100644 --- a/examples/zinx_version_ex/datapackDemo/Server.go +++ b/examples/zinx_version_ex/datapackDemo/Server.go @@ -4,7 +4,7 @@ import ( "fmt" "io" "net" - "zinx/znet" + "github.com/aceld/zinx/znet" ) //只是负责测试datapack拆包，封包功能 diff --git a/examples/zinx_version_ex/protoDemo/main.go b/examples/zinx_version_ex/protoDemo/main.go index e1cdb0a..b073852 100644 --- a/examples/zinx_version_ex/protoDemo/main.go +++ b/examples/zinx_version_ex/protoDemo/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" "github.com/golang/protobuf/proto" - "zinx/examples/zinx_version_ex/protoDemo/pb" + "github.com/aceld/zinx/examples/zinx_version_ex/protoDemo/pb" ) func main() { diff --git a/go.mod b/go.mod index bc7464c..0afff76 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module zinx +module github.com/aceld/zinx go 1.13 diff --git a/utils/globalobj.go b/utils/globalobj.go index 9b9e71b..9b976fb 100644 --- a/utils/globalobj.go +++ b/utils/globalobj.go @@ -4,8 +4,8 @@ import ( "encoding/json" "io/ioutil" "os" - "zinx/ziface" - "zinx/zlog" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/zlog" ) /* diff --git a/zinx_app_demo/mmo_game/api/move.go b/zinx_app_demo/mmo_game/api/move.go index 24c779d..1c98d02 100644 --- a/zinx_app_demo/mmo_game/api/move.go +++ b/zinx_app_demo/mmo_game/api/move.go @@ -3,10 +3,10 @@ package api import ( "fmt" "github.com/golang/protobuf/proto" - "zinx/ziface" - "zinx/zinx_app_demo/mmo_game/core" - "zinx/zinx_app_demo/mmo_game/pb" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/zinx_app_demo/mmo_game/core" + "github.com/aceld/zinx/zinx_app_demo/mmo_game/pb" + "github.com/aceld/zinx/znet" ) //玩家移动 diff --git a/zinx_app_demo/mmo_game/api/world_chat.go b/zinx_app_demo/mmo_game/api/world_chat.go index 18cc063..84d9a55 100644 --- a/zinx_app_demo/mmo_game/api/world_chat.go +++ b/zinx_app_demo/mmo_game/api/world_chat.go @@ -3,10 +3,10 @@ package api import ( "fmt" "github.com/golang/protobuf/proto" - "zinx/ziface" - "zinx/zinx_app_demo/mmo_game/core" - "zinx/zinx_app_demo/mmo_game/pb" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/zinx_app_demo/mmo_game/core" + "github.com/aceld/zinx/zinx_app_demo/mmo_game/pb" + "github.com/aceld/zinx/znet" ) //世界聊天 路由业务 diff --git a/zinx_app_demo/mmo_game/client_AI_robot.go b/zinx_app_demo/mmo_game/client_AI_robot.go index 035fc32..a574765 100644 --- a/zinx_app_demo/mmo_game/client_AI_robot.go +++ b/zinx_app_demo/mmo_game/client_AI_robot.go @@ -11,7 +11,7 @@ import ( "os" "os/signal" "time" - "zinx/zinx_app_demo/mmo_game/pb" + "github.com/aceld/zinx/zinx_app_demo/mmo_game/pb" ) type Message struct { diff --git a/zinx_app_demo/mmo_game/core/player.go b/zinx_app_demo/mmo_game/core/player.go index f94fd9a..ca4c155 100644 --- a/zinx_app_demo/mmo_game/core/player.go +++ b/zinx_app_demo/mmo_game/core/player.go @@ -6,8 +6,8 @@ import ( "math/rand" "sync" "time" - "zinx/ziface" - "zinx/zinx_app_demo/mmo_game/pb" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/zinx_app_demo/mmo_game/pb" ) //玩家对象 diff --git a/zinx_app_demo/mmo_game/server.go b/zinx_app_demo/mmo_game/server.go index 2fd62b1..9df814b 100644 --- a/zinx_app_demo/mmo_game/server.go +++ b/zinx_app_demo/mmo_game/server.go @@ -2,10 +2,10 @@ package main import ( "fmt" - "zinx/ziface" - "zinx/zinx_app_demo/mmo_game/api" - "zinx/zinx_app_demo/mmo_game/core" - "zinx/znet" + "github.com/aceld/zinx/ziface" + "github.com/aceld/zinx/zinx_app_demo/mmo_game/api" + "github.com/aceld/zinx/zinx_app_demo/mmo_game/core" + "github.com/aceld/zinx/znet" ) //当客户端建立连接的时候的hook函数 diff --git a/znet/connection.go b/znet/connection.go index 990a7d5..37510e4 100644 --- a/znet/connection.go +++ b/znet/connection.go @@ -6,8 +6,8 @@ import ( "io" "net" "sync" - "zinx/utils" - "zinx/ziface" + "github.com/aceld/zinx/utils" + "github.com/aceld/zinx/ziface" ) type Connection struct { diff --git a/znet/connmanager.go b/znet/connmanager.go index 03e4f1c..94ee9e2 100644 --- a/znet/connmanager.go +++ b/znet/connmanager.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" "sync" - "zinx/ziface" + "github.com/aceld/zinx/ziface" ) /* diff --git a/znet/datapack.go b/znet/datapack.go index 3b27696..3e43d02 100644 --- a/znet/datapack.go +++ b/znet/datapack.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" "errors" - "zinx/utils" - "zinx/ziface" + "github.com/aceld/zinx/utils" + "github.com/aceld/zinx/ziface" ) //封包拆包类实例，暂时不需要成员 diff --git a/znet/msghandler.go b/znet/msghandler.go index f42fcae..3684159 100644 --- a/znet/msghandler.go +++ b/znet/msghandler.go @@ -3,8 +3,8 @@ package znet import ( "fmt" "strconv" - "zinx/utils" - "zinx/ziface" + "github.com/aceld/zinx/utils" + "github.com/aceld/zinx/ziface" ) type MsgHandle struct { diff --git a/znet/request.go b/znet/request.go index 278d34f..c1e8392 100644 --- a/znet/request.go +++ b/znet/request.go @@ -1,6 +1,6 @@ package znet -import "zinx/ziface" +import "github.com/aceld/zinx/ziface" type Request struct { conn ziface.IConnection //已经和客户端建立好的 链接 diff --git a/znet/router.go b/znet/router.go index 0b88fc6..ac830b5 100644 --- a/znet/router.go +++ b/znet/router.go @@ -1,6 +1,6 @@ package znet -import "zinx/ziface" +import "github.com/aceld/zinx/ziface" //实现router时，先嵌入这个基类，然后根据需要对这个基类的方法进行重写 type BaseRouter struct {} diff --git a/znet/server.go b/znet/server.go index 90b5f77..0e3c4a9 100644 --- a/znet/server.go +++ b/znet/server.go @@ -3,8 +3,8 @@ package znet import ( "fmt" "net" - "zinx/utils" - "zinx/ziface" + "github.com/aceld/zinx/utils" + "github.com/aceld/zinx/ziface" ) var zinx_logo = ` diff --git a/znet/server_test.go b/znet/server_test.go index 28e8e3f..9100ea0 100644 --- a/znet/server_test.go +++ b/znet/server_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" "time" - "zinx/ziface" + "github.com/aceld/zinx/ziface" ) /* diff --git a/ztimer/delayfunc.go b/ztimer/delayfunc.go index ba9c378..ef27446 100644 --- a/ztimer/delayfunc.go +++ b/ztimer/delayfunc.go @@ -7,8 +7,8 @@ package ztimer import ( "fmt" + "github.com/aceld/zinx/zlog" "reflect" - "zinx/zlog" ) /* diff --git a/ztimer/timerscheduler.go b/ztimer/timerscheduler.go index 1fe45fc..27c2dd8 100644 --- a/ztimer/timerscheduler.go +++ b/ztimer/timerscheduler.go @@ -12,7 +12,7 @@ import ( "math" "sync" "time" - "zinx/zlog" + "github.com/aceld/zinx/zlog" ) const ( diff --git a/ztimer/timerscheduler_test.go b/ztimer/timerscheduler_test.go index 30eca34..93b74c2 100644 --- a/ztimer/timerscheduler_test.go +++ b/ztimer/timerscheduler_test.go @@ -11,7 +11,7 @@ import ( "fmt" "testing" "time" - "zinx/zlog" + "github.com/aceld/zinx/zlog" ) //触发函数 diff --git a/ztimer/timewheel.go b/ztimer/timewheel.go index a39b5f9..97283f9 100644 --- a/ztimer/timewheel.go +++ b/ztimer/timewheel.go @@ -10,7 +10,7 @@ import ( "fmt" "sync" "time" - "zinx/zlog" + "github.com/aceld/zinx/zlog" ) /*