Attachment #596514 for bug #663348

View | Details | Raw Unified | Return to bug 663348
Collapse All | Expand All




            (lProviders + nProviders)->SourceId = cSource::FromString(string2);
            asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
            asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);
            asprintf(&(lProviders + nProviders)->Parm3, "");
            nProviders ++;
            IsSkyThemesNull = true;
          }

            (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_1;
            (lProviders + nProviders)->SourceId = cSource::FromString(string2);
            asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
            asprintf(&(lProviders + nProviders)->Parm2, "");
            asprintf(&(lProviders + nProviders)->Parm3, "");
            nProviders ++;
          }
          else if(sscanf(Line, "MHW_2=%[^:] :%i :%c :%[^:] :%i ", string1, &int1, &char1, string2, &int2) == 5)

            (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_2;
            (lProviders + nProviders)->SourceId = cSource::FromString(string2);
            asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
            asprintf(&(lProviders + nProviders)->Parm2, "");
            asprintf(&(lProviders + nProviders)->Parm3, "");
            nProviders ++;
          }
          else if(sscanf(Line, "FILE=%[^:] :%s ", string1, string2) == 2)

            (lProviders + nProviders)->DataFormat = DATA_FORMAT_FILE;
            (lProviders + nProviders)->SourceId = 0;
            asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);
            asprintf(&(lProviders + nProviders)->Parm2, "");
            asprintf(&(lProviders + nProviders)->Parm3, "");
            nProviders ++;
          }
          else if(sscanf(Line, "SCRIPT=%[^:] :%[^:] :%s ", string1, string2, string3) == 3)

            (lProviders + nProviders)->SourceId = 0;
            asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);
            asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);
            asprintf(&(lProviders + nProviders)->Parm3, "");
            nProviders ++;
          }
        }

Return to bug 663348

Lines 159-165 Link Here

(-)loadepg-0.2.5.orig/loadepg.c (-8 / +8 lines)
159	(lProviders + nProviders)->SourceId = cSource::FromString(string2);	159	(lProviders + nProviders)->SourceId = cSource::FromString(string2);
160	asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);	160	asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
161	asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);	161	asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);
162	asprintf(&(lProviders + nProviders)->Parm3, '\0');	162	asprintf(&(lProviders + nProviders)->Parm3, "");
163	nProviders ++;	163	nProviders ++;
164	IsSkyThemesNull = true;	164	IsSkyThemesNull = true;
165	}	165	}
Lines 169-176 Link Here
169	(lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_1;	169	(lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_1;
170	(lProviders + nProviders)->SourceId = cSource::FromString(string2);	170	(lProviders + nProviders)->SourceId = cSource::FromString(string2);
171	asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);	171	asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
172	asprintf(&(lProviders + nProviders)->Parm2, '\0');	172	asprintf(&(lProviders + nProviders)->Parm2, "");
173	asprintf(&(lProviders + nProviders)->Parm3, '\0');	173	asprintf(&(lProviders + nProviders)->Parm3, "");
174	nProviders ++;	174	nProviders ++;
175	}	175	}
176	else if(sscanf(Line, "MHW_2=%[^:] :%i :%c :%[^:] :%i ", string1, &int1, &char1, string2, &int2) == 5)	176	else if(sscanf(Line, "MHW_2=%[^:] :%i :%c :%[^:] :%i ", string1, &int1, &char1, string2, &int2) == 5)
Lines 179-186 Link Here
179	(lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_2;	179	(lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_2;
180	(lProviders + nProviders)->SourceId = cSource::FromString(string2);	180	(lProviders + nProviders)->SourceId = cSource::FromString(string2);
181	asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);	181	asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
182	asprintf(&(lProviders + nProviders)->Parm2, '\0');	182	asprintf(&(lProviders + nProviders)->Parm2, "");
183	asprintf(&(lProviders + nProviders)->Parm3, '\0');	183	asprintf(&(lProviders + nProviders)->Parm3, "");
184	nProviders ++;	184	nProviders ++;
185	}	185	}
186	else if(sscanf(Line, "FILE=%[^:] :%s ", string1, string2) == 2)	186	else if(sscanf(Line, "FILE=%[^:] :%s ", string1, string2) == 2)
Lines 189-196 Link Here
189	(lProviders + nProviders)->DataFormat = DATA_FORMAT_FILE;	189	(lProviders + nProviders)->DataFormat = DATA_FORMAT_FILE;
190	(lProviders + nProviders)->SourceId = 0;	190	(lProviders + nProviders)->SourceId = 0;
191	asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);	191	asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);
192	asprintf(&(lProviders + nProviders)->Parm2, '\0');	192	asprintf(&(lProviders + nProviders)->Parm2, "");
193	asprintf(&(lProviders + nProviders)->Parm3, '\0');	193	asprintf(&(lProviders + nProviders)->Parm3, "");
194	nProviders ++;	194	nProviders ++;
195	}	195	}
196	else if(sscanf(Line, "SCRIPT=%[^:] :%[^:] :%s ", string1, string2, string3) == 3)	196	else if(sscanf(Line, "SCRIPT=%[^:] :%[^:] :%s ", string1, string2, string3) == 3)
Lines 200-206 Link Here
200	(lProviders + nProviders)->SourceId = 0;	200	(lProviders + nProviders)->SourceId = 0;
201	asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);	201	asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);
202	asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);	202	asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);
203	asprintf(&(lProviders + nProviders)->Parm3, '\0');	203	asprintf(&(lProviders + nProviders)->Parm3, "");
204	nProviders ++;	204	nProviders ++;
205	}	205	}
206	}	206	}