ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/branches/newio/src/xsnprintf.c
(Generate patch)

Comparing branches/newio/src/xsnprintf.c (file contents):
Revision 2405 by michael, Tue Jul 9 11:22:52 2013 UTC vs.
Revision 2406 by michael, Tue Jul 16 21:44:45 2013 UTC

# Line 2077 | Line 2077 | doprintf(struct Client *dest, struct Buf
2077        vdata->vd_chars = buf_s.buf_loc; /* return relevant data */
2078        vdata->vd_overflow = SNP_MAX(buf_s.buf_overflow, buf_s.overflow);
2079      } else if ((fld_s.flags & CONV_MASK) == CONV_CLIENT) {
2080 <      struct Client *cptr = fld_s.value.v_ptr;
2080 >      struct Client *client_p = fld_s.value.v_ptr;
2081        const char *str1 = NULL, *str2 = NULL, *str3 = NULL;
2082        int slen1 = 0, slen2 = 0, slen3 = 0, elen = 0, plen = 0;
2083  
2084        /* &me is used if it's not a definite server */
2085        if (dest && (IsServer(dest) || IsMe(dest))) {
2086 <        if (IsServer(cptr) || IsMe(cptr))
2087 <          str1 = ID(cptr);
2086 >        if (IsServer(client_p) || IsMe(client_p))
2087 >          str1 = ID(client_p);
2088          else {
2089 <          str1 = ID(cptr->servptr);
2090 <          str2 = ID(cptr);
2089 >          str1 = ID(client_p->servptr);
2090 >          str2 = ID(client_p);
2091          }
2092          fld_s.flags &= ~(FLAG_ALT | FLAG_COLON);
2093        } else {
2094 <        str1 = cptr->name[0] ? cptr->name : "*";
2095 <        if (!IsServer(cptr) && !IsMe(cptr) && fld_s.flags & FLAG_ALT) {
2096 <          assert(cptr->name[0]);
2097 <          str2 = cptr->username;
2098 <          str3 = cptr->host;
2094 >        str1 = client_p->name[0] ? client_p->name : "*";
2095 >        if (!IsServer(client_p) && !IsMe(client_p) && fld_s.flags & FLAG_ALT) {
2096 >          assert(client_p->name[0]);
2097 >          str2 = client_p->username;
2098 >          str3 = client_p->host;
2099          } else
2100            fld_s.flags &= ~FLAG_ALT;
2101        }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines