Changeset 8c1d295 in git


Ignore:
Timestamp:
27/01/14 11:15:41 (6 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
f2dc821
Parents:
e6312c0
Message:

src/cad3d.c,src/str.c,src/str.h: Rename s_cat_len() to s_catlen()
for consistency with s_catchar().

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    re6312c0 r8c1d295  
     1Mon Jan 27 11:15:17 GMT 2014  Olly Betts <olly@survex.com>
     2
     3        * src/cad3d.c,src/str.c,src/str.h: Rename s_cat_len() to s_catlen()
     4          for consistency with s_catchar().
     5
    16Mon Jan 27 11:13:31 GMT 2014  Olly Betts <olly@survex.com>
    27
  • src/cad3d.c

    re6312c0 r8c1d295  
    567567      unsigned char ch = *q;
    568568      if (ch <= ' ' || ch == '%') {
    569          s_cat_len(&escaped, &elen, s, q - s);
     569         s_catlen(&escaped, &elen, s, q - s);
    570570         s_catchar(&escaped, &elen, '%');
    571571         s_catchar(&escaped, &elen, "0123456789abcdef"[ch >> 4]);
     
    575575   }
    576576   if (escaped) {
    577       s_cat_len(&escaped, &elen, s, q - s);
     577      s_catlen(&escaped, &elen, s, q - s);
    578578      set_name(p, escaped);
    579579      return;
  • src/str.c

    re6312c0 r8c1d295  
    2424/* append a string */
    2525void
    26 s_cat(char **pstr, int *plen, char *s)
     26s_cat(char **pstr, int *plen, const char *s)
    2727{
    28    s_cat_len(pstr, plen, s, strlen(s));
     28   s_catlen(pstr, plen, s, strlen(s));
    2929}
    3030
    3131/* append a string with length */
    3232void
    33 s_cat_len(char **pstr, int *plen, char *s, int s_len)
     33s_catlen(char **pstr, int *plen, const char *s, int s_len)
    3434{
    3535   int new_len = s_len + 1; /* extra 1 for nul */
  • src/str.h

    re6312c0 r8c1d295  
    1919#include "osalloc.h"
    2020
    21 void s_cat(char **pstr, int *plen, char *s);
     21void s_cat(char **pstr, int *plen, const char *s);
    2222
    23 void s_cat_len(char **pstr, int *plen, char *s, int s_len);
     23void s_catlen(char **pstr, int *plen, const char *s, int s_len);
    2424
    2525/* append a character */
Note: See TracChangeset for help on using the changeset viewer.