Changeset bc547d3 for libcfa/src/collections/string.cfa
- Timestamp:
- May 8, 2026, 6:09:22 PM (9 hours ago)
- Branches:
- master
- Parents:
- 2f16569
- File:
-
- 1 edited
-
libcfa/src/collections/string.cfa (modified) (20 diffs)
Legend:
- Unmodified
- Added
- Removed
-
libcfa/src/collections/string.cfa
r2f16569 rbc547d3 10 10 // Created On : Fri Sep 03 11:00:00 2021 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Fri May 8 0 7:41:00202613 // Update Count : 4 0912 // Last Modified On : Fri May 8 08:38:51 2026 13 // Update Count : 413 14 14 // 15 15 … … 57 57 } 58 58 59 void ?{}( string & s, const char * cs) {59 void ?{}( string & s, const char cs[] ) { 60 60 (s.inner) { malloc() }; 61 61 ?{}( *s.inner, cs ); 62 62 } 63 63 64 void ?{}( string & s, const char * cs, size_t size ) {64 void ?{}( string & s, const char cs[] , size_t size ) { 65 65 (s.inner) { malloc() }; 66 66 ?{}( *s.inner, cs, size ); … … 128 128 } 129 129 130 string & ?=?( string & s, const char * rhs) {130 string & ?=?( string & s, const char rhs[] ) { 131 131 (*s.inner) = rhs; 132 132 return s; … … 138 138 } 139 139 140 string & assign( string & s, const char * rhs, size_t n ) {140 string & assign( string & s, const char rhs[], size_t n ) { 141 141 assign( *s.inner, rhs, n ); 142 142 return s; … … 177 177 178 178 // safe conversion from string to char * 179 char * strncpy( char * dst, string & src, size_t n ) {179 char * strncpy( char dst[], string & src, size_t n ) { 180 180 size_t l = min( n - 1, len( src ) ); // ensure null terminated 181 181 for ( i; l ) dst[i] = src[i]; … … 273 273 } 274 274 275 void ?+=?( string & s, const char * cs) {275 void ?+=?( string & s, const char cs[] ) { 276 276 (*s.inner) += cs; 277 277 } 278 278 279 void append( string & s, const char * buffer, size_t bsize ) {279 void append( string & s, const char buffer[], size_t bsize ) { 280 280 append( (*s.inner), buffer, bsize ); 281 281 } … … 299 299 } 300 300 301 string ?+?( const char * cs, char c ) {301 string ?+?( const char cs[], char c ) { 302 302 string ret = cs; 303 303 ret += c; … … 305 305 } 306 306 307 string ?+?( char c, const char * cs) {307 string ?+?( char c, const char cs[] ) { 308 308 string ret = c; 309 309 ret += cs; … … 311 311 } 312 312 313 string ?+?( const char * cs1, const char * cs2) {313 string ?+?( const char cs1[], const char cs2[] ) { 314 314 string ret = cs1; 315 315 ret += cs2; … … 317 317 } 318 318 319 string ?+?( const char * cs, string s ) {319 string ?+?( const char cs[], string s ) { 320 320 string ret = cs; 321 321 ret += s; … … 323 323 } 324 324 325 string ?+?( string s, const char * cs) {325 string ?+?( string s, const char cs[] ) { 326 326 string ret = s; 327 327 ret += cs; … … 354 354 } 355 355 356 string ?*?( const char * cs, strmul_factor_t factor ) {356 string ?*?( const char cs[], strmul_factor_t factor ) { 357 357 string ret = cs; 358 358 ret *= factor; … … 384 384 } 385 385 386 int strncmp( const string & s, const char * cs, size_t maxlen ) {386 int strncmp( const string & s, const char cs[], size_t maxlen ) { 387 387 size_t cslen = len( cs ); 388 388 if ( maxlen > len( s ) || maxlen > cslen ) { … … 392 392 } 393 393 394 int strncmp( const char * s, const string & cs, size_t maxlen ) {395 size_t slen = len( s );396 if ( maxlen > slen || maxlen > len( cs ) ) {397 abort( STRNCPY_FMT, maxlen, slen, len( cs ) );394 int strncmp( const char cs[], const string & s, size_t maxlen ) { 395 size_t slen = len( cs ); 396 if ( maxlen > slen || maxlen > len( s ) ) { 397 abort( STRNCPY_FMT, maxlen, slen, len( s ) ); 398 398 } // if 399 return strcmp$( s, maxlen, cs.inner->Handle.s, maxlen );399 return strcmp$( cs, maxlen, s.inner->Handle.s, maxlen ); 400 400 } 401 401 … … 425 425 } 426 426 427 size_t find( const string & s, const char * key) {427 size_t find( const string & s, const char key[] ) { 428 428 return find( *s.inner, key ); 429 429 } 430 430 431 size_t find( const string & s, const char * key, size_t keysize ) {431 size_t find( const string & s, const char key[], size_t keysize ) { 432 432 return find( *s.inner, key, keysize ); 433 433 } … … 437 437 } 438 438 439 size_t find( const string & s, size_t start, const char * key) {439 size_t find( const string & s, size_t start, const char key[] ) { 440 440 return findFrom( *s.inner, start, key ); 441 441 } 442 442 443 size_t find( const string & s, size_t start, const char * key, size_t keysize ) {443 size_t find( const string & s, size_t start, const char key[], size_t keysize ) { 444 444 return findFrom( *s.inner, start, key, keysize ); 445 445 } … … 449 449 // } 450 450 451 // bool includes( const string & s, const char * search) {451 // bool includes( const string & s, const char search[] ) { 452 452 // return includes( *s.inner, search ); 453 453 // } 454 454 455 // bool includes( const string & s, const char * search, size_t searchsize ) {455 // bool includes( const string & s, const char search[], size_t searchsize ) { 456 456 // return includes( *s.inner, search, searchsize ); 457 457 // } … … 461 461 } 462 462 463 bool startsWith( const string & s, const char * prefix) {463 bool startsWith( const string & s, const char prefix[] ) { 464 464 return startsWith( *s.inner, prefix ); 465 465 } 466 466 467 bool startsWith( const string & s, const char * prefix, size_t prefixsize ) {467 bool startsWith( const string & s, const char prefix[], size_t prefixsize ) { 468 468 return startsWith( *s.inner, prefix, prefixsize ); 469 469 } … … 473 473 } 474 474 475 bool endsWith( const string & s, const char * suffix) {475 bool endsWith( const string & s, const char suffix[] ) { 476 476 return endsWith( *s.inner, suffix ); 477 477 } 478 478 479 bool endsWith( const string & s, const char * suffix, size_t suffixsize ) {479 bool endsWith( const string & s, const char suffix[], size_t suffixsize ) { 480 480 return endsWith( *s.inner, suffix, suffixsize ); 481 481 } … … 490 490 } 491 491 492 void ?{}( charclass & s, const char * chars) {492 void ?{}( charclass & s, const char chars[] ) { 493 493 (s.inner) { malloc() }; 494 494 ?{}( *s.inner, chars ); 495 495 } 496 496 497 void ?{}( charclass & s, const char * chars, size_t charssize ) {497 void ?{}( charclass & s, const char chars[], size_t charssize ) { 498 498 (s.inner) { malloc() }; 499 499 ?{}( *s.inner, chars, charssize );
Note:
See TracChangeset
for help on using the changeset viewer.