update the merge of client api and sc

This commit is contained in:
Yuxuan Li
2017-04-21 16:18:59 -07:00
parent bab6b617b7
commit 983d8372ea
4 changed files with 45 additions and 81 deletions

View File

@ -483,4 +483,17 @@ func min(a, b int) int {
return b
}
func getMaxSize(mcMax, doptMax *int, defaultVal int) int {
if mcMax == nil && doptMax == nil {
return defaultVal
}
if mcMax != nil && doptMax != nil {
return min(*mcMax, *doptMax)
}
if mcMax != nil {
return *mcMax
}
return *doptMax
}
const grpcUA = "grpc-go/" + Version