Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'unstable' of github.com:huangz1990/annotated_redis_sour…
…ce into unstable
  • Loading branch information
huangzworks committed Oct 29, 2013
2 parents 3fc63d0 + 961a99a commit ffc4836
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/networking.c
Expand Up @@ -61,7 +61,7 @@ redisClient *createClient(int fd) {
* contexts (for instance a Lua script) we need a non connected client. */
// 因为 Redis 命令总在客户端的上下文中执行,
// 有时候为了在服务器内部执行命令,需要使用伪客户端来执行命令
// 在 fd == 1 时,创建的客户端为伪终端
// 在 fd == -1 时,创建的客户端为伪终端
if (fd != -1) {
anetNonBlock(NULL,fd);
anetTcpNoDelay(NULL,fd);
Expand Down
5 changes: 3 additions & 2 deletions src/sds.c
Expand Up @@ -104,8 +104,9 @@ sds sdsdup(const sds s) {
}

/*
* 释放 sds 所对应的 sdshdr 结构的内存
* 给定 sds 必须为 NULL
* 释放 sds 所对应的 sdshdr 结构的内存。
*
* 如果 s 为 NULL ,那么不做动作。
*
* T = O(N)
*/
Expand Down

0 comments on commit ffc4836

Please sign in to comment.