Merge "Use naming.Join now that it can take a variable number of args."
diff --git a/examples/stfortune/stfortune/main.go b/examples/stfortune/stfortune/main.go
index e4319a0..3fc2f75 100644
--- a/examples/stfortune/stfortune/main.go
+++ b/examples/stfortune/stfortune/main.go
@@ -27,11 +27,11 @@
)
func fortunePath(name string) string {
- return naming.Join(naming.Join(appPath, "fortunes"), name)
+ return naming.Join(appPath, "fortunes", name)
}
func userPath(name string) string {
- return naming.Join(naming.Join(appPath, "usernames"), name)
+ return naming.Join(appPath, "usernames", name)
}
// Hashes a string.
diff --git a/services/mgmt/application/impl/invoker.go b/services/mgmt/application/impl/invoker.go
index 79c3fdf..7026821 100644
--- a/services/mgmt/application/impl/invoker.go
+++ b/services/mgmt/application/impl/invoker.go
@@ -2,7 +2,6 @@
import (
"errors"
- "path"
"strings"
_ "veyron/services/store/typeregistryhack"
@@ -80,7 +79,7 @@
return empty, errInvalidSuffix
}
for _, profile := range profiles {
- path := path.Join("/applications", name, profile, version)
+ path := naming.Join("/applications", name, profile, version)
entry, err := i.store.BindObject(path).Get(context)
if err != nil {
continue
@@ -110,7 +109,7 @@
}
var entry storage.Stat
for _, profile := range profiles {
- path := naming.Join(tname, path.Join("/applications", name, profile, version))
+ path := naming.Join(tname, "/applications", name, profile, version)
if err := makeParentNodes(context, i.store, path); err != nil {
return err
}
@@ -142,7 +141,7 @@
if err != nil {
return err
}
- path := naming.Join(tname, path.Join("/applications", name, profile))
+ path := naming.Join(tname, "/applications", name, profile)
if version != "" {
path += "/" + version
}
diff --git a/services/mgmt/profile/impl/invoker.go b/services/mgmt/profile/impl/invoker.go
index e1e2b4d..38241e3 100644
--- a/services/mgmt/profile/impl/invoker.go
+++ b/services/mgmt/profile/impl/invoker.go
@@ -2,7 +2,6 @@
import (
"errors"
- "path"
"veyron/services/mgmt/profile"
@@ -59,7 +58,7 @@
if err != nil {
return err
}
- path := naming.Join(tname, path.Join("/profiles", i.suffix))
+ path := naming.Join(tname, "/profiles", i.suffix)
if err := makeParentNodes(context, i.store, path); err != nil {
return err
}
@@ -80,7 +79,7 @@
if err != nil {
return err
}
- path := naming.Join(tname, path.Join("/profiles", i.suffix))
+ path := naming.Join(tname, "/profiles", i.suffix)
object := i.store.BindObject(path)
found, err := object.Exists(context)
if err != nil {
@@ -102,7 +101,7 @@
func (i *invoker) lookup(context ipc.ServerContext) (profile.Specification, error) {
empty := profile.Specification{}
- path := path.Join("/profiles", i.suffix)
+ path := naming.Join("/profiles", i.suffix)
entry, err := i.store.BindObject(path).Get(context)
if err != nil {
return empty, errNotFound
diff --git a/services/mounttable/lib/mounttable.go b/services/mounttable/lib/mounttable.go
index 866df60..0e7ef27 100644
--- a/services/mounttable/lib/mounttable.go
+++ b/services/mounttable/lib/mounttable.go
@@ -357,7 +357,7 @@
// Recurse through the children.
for k, c := range n.children {
if ok, suffix := pattern.MatchInitialSegment(k); ok {
- mt.globStep(c, path.Join(name, k), suffix, context, reply)
+ mt.globStep(c, naming.Join(name, k), suffix, context, reply)
}
}
}
diff --git a/services/mounttable/lib/neighborhood.go b/services/mounttable/lib/neighborhood.go
index 2a1206f..4e4cbb1 100644
--- a/services/mounttable/lib/neighborhood.go
+++ b/services/mounttable/lib/neighborhood.go
@@ -3,7 +3,6 @@
import (
"errors"
"net"
- "path"
"strconv"
"strings"
@@ -217,7 +216,7 @@
if neighbor == nil {
return nil, "", naming.ErrNoSuchName
}
- return neighbor, path.Join(ns.elems[1:]...), nil
+ return neighbor, naming.Join(ns.elems[1:]...), nil
}
// Mount not implemented.
