diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-11-02 15:14:17 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-11-02 15:14:17 +0000 |
| commit | 0c189c5159e8af6836ac985270da6a2ddff62456 (patch) | |
| tree | c14653544473f2f339be1e02193e11f46b86bb05 /src/core | |
| parent | 67765e89188c58fba8b70605bf8da742666e7d7e (diff) | |
| download | nginx-0c189c5159e8af6836ac985270da6a2ddff62456.tar.gz nginx-0c189c5159e8af6836ac985270da6a2ddff62456.tar.bz2 | |
rename ngx_peer_addr_t to ngx_addr_t
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_inet.c | 6 | ||||
| -rw-r--r-- | src/core/ngx_inet.h | 4 | ||||
| -rw-r--r-- | src/core/ngx_resolver.c | 2 | ||||
| -rw-r--r-- | src/core/ngx_resolver.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c index 7dfd3413e..5d2f86ecf 100644 --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -485,7 +485,7 @@ ngx_parse_unix_domain_url(ngx_pool_t *pool, ngx_url_t *u) saun->sun_family = AF_UNIX; (void) ngx_cpystrn((u_char *) saun->sun_path, path, len); - u->addrs = ngx_pcalloc(pool, sizeof(ngx_peer_addr_t)); + u->addrs = ngx_pcalloc(pool, sizeof(ngx_addr_t)); if (u->addrs == NULL) { return NGX_ERROR; } @@ -846,7 +846,7 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u) /* MP: ngx_shared_palloc() */ - u->addrs = ngx_pcalloc(pool, i * sizeof(ngx_peer_addr_t)); + u->addrs = ngx_pcalloc(pool, i * sizeof(ngx_addr_t)); if (u->addrs == NULL) { return NGX_ERROR; } @@ -884,7 +884,7 @@ ngx_inet_resolve_host(ngx_pool_t *pool, ngx_url_t *u) /* MP: ngx_shared_palloc() */ - u->addrs = ngx_pcalloc(pool, sizeof(ngx_peer_addr_t)); + u->addrs = ngx_pcalloc(pool, sizeof(ngx_addr_t)); if (u->addrs == NULL) { return NGX_ERROR; } diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h index f3bf9e4e1..7e8cce68d 100644 --- a/src/core/ngx_inet.h +++ b/src/core/ngx_inet.h @@ -70,7 +70,7 @@ typedef struct { struct sockaddr *sockaddr; socklen_t socklen; ngx_str_t name; -} ngx_peer_addr_t; +} ngx_addr_t; typedef struct { @@ -94,7 +94,7 @@ typedef struct { socklen_t socklen; u_char sockaddr[NGX_SOCKADDRLEN]; - ngx_peer_addr_t *addrs; + ngx_addr_t *addrs; ngx_uint_t naddrs; char *err; diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index d0ba8bc4e..9adc2d223 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -92,7 +92,7 @@ static void *ngx_resolver_dup(ngx_resolver_t *r, void *src, size_t size); /* STUB: ngx_peer_addr_t * */ ngx_resolver_t * -ngx_resolver_create(ngx_conf_t *cf, ngx_peer_addr_t *addr) +ngx_resolver_create(ngx_conf_t *cf, ngx_addr_t *addr) { ngx_resolver_t *r; ngx_pool_cleanup_t *cln; diff --git a/src/core/ngx_resolver.h b/src/core/ngx_resolver.h index 6c4afac97..3e7c388da 100644 --- a/src/core/ngx_resolver.h +++ b/src/core/ngx_resolver.h @@ -135,7 +135,7 @@ struct ngx_resolver_ctx_s { }; -ngx_resolver_t *ngx_resolver_create(ngx_conf_t *cf, ngx_peer_addr_t *addr); +ngx_resolver_t *ngx_resolver_create(ngx_conf_t *cf, ngx_addr_t *addr); ngx_resolver_ctx_t *ngx_resolve_start(ngx_resolver_t *r, ngx_resolver_ctx_t *temp); ngx_int_t ngx_resolve_name(ngx_resolver_ctx_t *ctx); |