- Timestamp:
- 10/13/20 21:11:02 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-conf-mk.c
r11645 r11651 16 16 if (!caidtab || !caidtab->ctnum) return ""; 17 17 18 // Max entry length is cs_strlen("1234&ffff:1234,") == 1518 // Max entry length is strlen("1234&ffff:1234,") == 15 19 19 int32_t i, maxlen = 16 * caidtab->ctnum, pos = 0; 20 20 … … 48 48 if (!ttab || !ttab->ttnum) return ""; 49 49 50 // Each entry max length is cs_strlen("aaaa.bbbb:cccc,") == 1550 // Each entry max length is strlen("aaaa.bbbb:cccc,") == 15 51 51 int32_t i, maxlen = 16 * ttab->ttnum, pos = 0; 52 52 … … 120 120 121 121 // Worst case scenario where each entry have different 122 // caid, ident and only one length in it is cs_strlen("1234:123456,") == 12122 // caid, ident and only one length in it is strlen("1234:123456,") == 12 123 123 int32_t i, j, maxlen = 13 * ftab->nfilts, pos = 0; 124 124 125 125 for(i = 0; i < ftab->nfilts; i++) 126 126 { 127 maxlen += ftab->filts[i].nprids * 7; /* cs_strlen("123456,") == 7 */127 maxlen += ftab->filts[i].nprids * 7; /* strlen("123456,") == 7 */ 128 128 } 129 129 … … 603 603 if(cfg.logtostdout == 1) { needed += 7; } 604 604 if(cfg.logtosyslog == 1) { needed += 7; } 605 if(cfg.logfile) { needed += cs_strlen(cfg.logfile); }605 if(cfg.logfile) { needed += strlen(cfg.logfile); } 606 606 if(needed == 1 || !cs_malloc(&value, needed)) { return ""; } 607 607 … … 633 633 634 634 // Worst case scenario where each entry have different 635 // caid, ident and only one length in it is cs_strlen("1234@123456:01;") == 15635 // caid, ident and only one length in it is strlen("1234@123456:01;") == 15 636 636 int32_t i, maxlen = 16 * ecm_whitelist->ewnum, pos = 0; 637 637 char *ret; … … 676 676 677 677 // Worst case scenario where each entry have different 678 // caid, provid and only one header in it is cs_strlen("1234@123456:0102030405060708091011121314151617181920;") == 52 ((sizeof(header) / 2) + 12)678 // caid, provid and only one header in it is strlen("1234@123456:0102030405060708091011121314151617181920;") == 52 ((sizeof(header) / 2) + 12) 679 679 int32_t i, r, maxlen = 53 * ecm_hdr_whitelist->ehnum, pos = 0; 680 680 char *ret; … … 774 774 if (!caidvaluetab || !caidvaluetab->cvnum) return ""; 775 775 776 // Max entry length is cs_strlen("1234@65535,") == 11776 // Max entry length is strlen("1234@65535,") == 11 777 777 int32_t i, maxlen = 12 * caidvaluetab->cvnum, pos = 0; 778 778 char *ret; … … 1057 1057 if(value_in_day == 0) 1058 1058 { 1059 cs_strncat(result, &sepday[0], MAXALLOWEDTF);1060 cs_strncat(result, (char *)shortDay[day], MAXALLOWEDTF);1061 cs_strncat(result, "@", MAXALLOWEDTF);1059 strcat(result, &sepday[0]); 1060 strcat(result, shortDay[day]); 1061 strcat(result, "@"); 1062 1062 value_in_day = 1; 1063 1063 intime = 0; … … 1068 1068 if(!intime) 1069 1069 { 1070 cs_strncat(result, &septime[0], MAXALLOWEDTF);1070 strcat(result, &septime[0]); 1071 1071 snprintf(mytime, sizeof(mytime), "%02d:%02d", hours, minutes); 1072 cs_strncat(result, mytime, MAXALLOWEDTF);1073 cs_strncat(result, "-", MAXALLOWEDTF);1072 strcat(result, mytime); 1073 strcat(result, "-"); 1074 1074 septime[0] = ','; 1075 1075 intime = 1; … … 1079 1079 if(((hours * 60) + minutes) == 1439) 1080 1080 { 1081 cs_strncat(result, "24:00", MAXALLOWEDTF);1081 strcat(result, "24:00"); 1082 1082 intime = 0; 1083 1083 septime[0] = '\0'; … … 1088 1088 { 1089 1089 snprintf(mytime, sizeof(mytime), "%02d:%02d", hours, minutes); 1090 cs_strncat(result, mytime, MAXALLOWEDTF);1090 strcat(result, mytime); 1091 1091 septime[0] = ','; 1092 1092 intime = 0; … … 1110 1110 void free_mk_t(char *value) 1111 1111 { 1112 if( cs_strlen(value) > 0) { NULLFREE(value); }1113 } 1112 if(strlen(value) > 0) { NULLFREE(value); } 1113 }
Note:
See TracChangeset
for help on using the changeset viewer.