MCL/sf/mw/usbservices: comparison usbclasses/pictbridgeengine/src/dpsoperation.cpp

equal deleted inserted replaced

-:3e3bd14de94e
+:c00b160ac7eb
 return KErrNoMemory;
 }
 // jobConfig
 TInt count = iReqParam.iJobConfig.Count();
+TInt ret = KErrNone;
 elemsP[0].iElement = EDpsJobConfig;
 elemsP[0].iNum = count;
-aElements.Append(elemsP[0]);
+if ( (ret = aElements.Append(elemsP[0])) != KErrNone )
+{
+IF_DEBUG(Print(_L("*** append error")));
+return ret;
+}
 for (TInt i = 0; i < count; i++)
 {
 argsP[i].iElement = iReqParam.iJobConfig[i].iElement;
 	// the parameter only has high bytes (0x1234)
 	argsP[i].iContent.AppendNumUC(iReqParam.iJobConfig[i].iContent, EHex);
 	// we have to append the low bytes (0000)
 	argsP[i].iContent.Append(KDpsLowZero);
-	aArgs.Append(argsP[i]);
+	if ( (ret = aArgs.Append(argsP[i])) != KErrNone )
+	    {
+	    IF_DEBUG(Print(_L("*** append error")));
+	    return ret;
+	    }
 	IF_DEBUG(Print(_L("the element is %d"), argsP[i].iElement));
 	IF_DEBUG(Print(_L("the content is %S"), &(argsP[i].iContent)));
 	}
 // printInfo
 for (TInt j = 0; j < imageCount; j++)
 {
 	// there is at least one argument for fileID
 	TInt k = 1;
 	elemsP[j + 1].iElement = EDpsPrintInfo;
 	argsP[count].iElement = EDpsArgFileID;
 	argsP[count].iContent.AppendNumFixedWidth(objectHandles[j], EHex,
 	                                          KFullWordWidth);
-	aArgs.Append(argsP[count]);
+	if ( (ret = aArgs.Append(argsP[count])) != KErrNone )
+	    {
+	    IF_DEBUG(Print(_L("*** append error")));
+	    return ret;
+	    }
 	IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
 	IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
 	count++;
 	// not empty
 	if (iReqParam.iPrintInfo[j].iFileName)
 	    {
 	    argsP[count].iElement = EDpsArgFileName;
 	    argsP[count].iContent.Copy(iReqParam.iPrintInfo[j].iFile);
-	    aArgs.Append(argsP[count]);
+	    if ( (ret = aArgs.Append(argsP[count])) != KErrNone)
+	        {
+IF_DEBUG(Print(_L("*** append error")));
+	        return ret;
+	        }
 	    IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
 	    IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
 	    k++; count++;
 	// not empty
 	if (iReqParam.iPrintInfo[j].iDate.Size())
 	    {
 argsP[count].iElement = EDpsArgDate;
 argsP[count].iContent.Copy(iReqParam.iPrintInfo[j].iDate);
-aArgs.Append(argsP[count]);
+if ( (ret = aArgs.Append(argsP[count])) != KErrNone)
+{
+IF_DEBUG(Print(_L("*** append error")));
+return ret;
+}
 IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
 	    IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
 k++; count++;
 	    }
 	if (iReqParam.iPrintInfo[j].iCopies != 0)
 	    {
 argsP[count].iElement = EDpsArgCopies;
 argsP[count].iContent.AppendNumFixedWidthUC(
 iReqParam.iPrintInfo[j].iCopies, EDecimal, KCopyFileWidth);
-aArgs.Append(argsP[count]);
+if ( (ret = aArgs.Append(argsP[count])) != KErrNone)
+{
+IF_DEBUG(Print(_L("*** append error")));
+return ret;
+}
 IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
 	    IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
 	    k++; count++;
 	    }
 	if (iReqParam.iPrintInfo[j].iPrtPID != 0)
 	    {
 argsP[count].iElement = EDpsArgPrtPID;
 argsP[count].iContent.AppendNumUC(iReqParam.iPrintInfo[j].iPrtPID);
-aArgs.Append(argsP[count]);
+if ( (ret = aArgs.Append(argsP[count])) != KErrNone)
+{
+IF_DEBUG(Print(_L("*** append error")));
+return ret;
+}
 IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
 	    IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
 	    k++; count++;
 	    }
 	if (iReqParam.iPrintInfo[j].iCopyID != 0)
 	    {
 argsP[count].iElement = EDpsArgCopyID;
 argsP[count].iContent.AppendNumUC(iReqParam.iPrintInfo[j].iCopyID);
-aArgs.Append(argsP[count]);
+if ( (ret = aArgs.Append(argsP[count])) != KErrNone)
+{
+IF_DEBUG(Print(_L("*** append error")));
+return ret;
+}
 IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement));
 	    IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent)));
 	    k++; count++;
 	    }
 	elemsP[j + 1].iNum = k;
-	aElements.Append(elemsP[j + 1]);
+	if ( (ret = aElements.Append(elemsP[j + 1])) != KErrNone)
+	    {
+IF_DEBUG(Print(_L("*** append error")));
+	    return ret;
+	    }
 	}
 delete[] objectHandles;
 delete[] argsP;
 delete[] elemsP;
 IF_DEBUG(Print(_L(">>>TDpsAbortJob::FillReqArgs")));
 TDpsArg arg;
 arg.iElement = EDpsArgAbortStyle;
 arg.iContent.AppendNumUC(iReqParam.iAbortStyle, EHex);
 arg.iContent.Append(KDpsLowZero);
-aArgs.Append(arg);
+TInt ret = aArgs.Append(arg);
+if (ret != KErrNone)
+{
+IF_DEBUG(Print(_L("*** append error")));
+}
 IF_DEBUG(Print(_L("<<<TDpsAbortJob::FillReqArgs")));
-return KErrNone;
+return ret;
 }
 // ---------------------------------------------------------------------------
 // Some request parameters should be checked
 // ---------------------------------------------------------------------------
 IF_DEBUG(Print(_L(">>>TDpsGetCapability::FillReqArgs")));
 // only one element
 TDpsEle elems;
 elems.iElement = EDpsCapability;
 elems.iNum = 1;
-aElements.Append(elems);
+TInt ret = KErrNone;
+if ( (ret = aElements.Append(elems)) != KErrNone)
+{
+IF_DEBUG(Print(_L("*** append error")));
+return ret;
+}
 // only one parameter
 TDpsArg argsP;
 argsP.iElement = iReqParam.iCap;
-aArgs.Append(argsP);
+if ( (ret = aArgs.Append(argsP)) != KErrNone)
+{
+IF_DEBUG(Print(_L("*** append error")));
+return ret;
+}
 if (EDpsArgPaperTypes == iReqParam.iCap || EDpsArgLayouts == iReqParam.iCap)
 {
 if (iReqParam.iAttribute != 0)
 {
 aAttrib = iReqParam.iAttribute;
 TDpsArg* argsP = new TDpsArg[KConfigPrintService];
 if (!argsP)
 {
 return KErrNoMemory;
 }
 TInt count;
+TInt ret = KErrNone;
 for (TInt i = 0; i < KConfigPrintService; i++)
 {
 switch (i)
 {
 // there might be several versions
 (iReqParam.iDpsVersions[j].iMajor);
 argsP[i].iContent.Append(_L("."));
 argsP[i].iContent.AppendNumUC
 (iReqParam.iDpsVersions[j].iMinor);
 }
-aArgs.Append(argsP[i]);
+ret = aArgs.Append(argsP[i]);
 break;
 case EDpsArgVendorName: // vender name
 argsP[i].iElement = EDpsArgVendorName;
 argsP[i].iContent.Append(iReqParam.iVendorName);
-aArgs.Append(argsP[i]);
+ret = aArgs.Append(argsP[i]);
 break;
 case EDpsArgVendorSpecificVersion: // vender version (optional)
 if (iReqParam.iVendorVersion.iMajor &&
 {
 argsP[i].iElement = EDpsArgVendorSpecificVersion;
 argsP[i].iContent.AppendNumUC(iReqParam.iVendorVersion.iMajor);
 argsP[i].iContent.Append(_L("."));
 argsP[i].iContent.AppendNumUC(iReqParam.iVendorVersion.iMinor);
-aArgs.Append(argsP[i]);
+ret = aArgs.Append(argsP[i]);
 }
 break;
 case EDpsArgProductName: // produce name
 argsP[i].iElement = EDpsArgProductName;
 argsP[i].iContent.Append(iReqParam.iProductName);
-aArgs.Append(argsP[i]);
+ret = aArgs.Append(argsP[i]);
 break;
 case EDpsArgSerialNo: // serialNo (optional)
 if (iReqParam.iSerialNo.Length())
 {
 argsP[i].iElement = EDpsArgSerialNo;
 argsP[i].iContent.Append(iReqParam.iSerialNo);
-aArgs.Append(argsP[i]);
+ret = aArgs.Append(argsP[i]);
 }
 break;
 default:
 delete[] argsP;
 return KErrArgument;
 }
 }
+if (ret != KErrNone)
+{
+IF_DEBUG(Print( _L("***TDpsConfigPrintService::FillReqArgs append error = %d"), ret));
+}
 delete[] argsP;
 IF_DEBUG(Print(_L("<<<TDpsConfigPrintService::FillReqArgs")));
-return KErrNone;
+return ret;
 }
 // ---------------------------------------------------------------------------
 //  Not all parameters are checked. If the invalid parameter can pass the
 //  the complaint test, it should not be checked. Instead, the client will see
 CDpsTransaction* aTrader)
 {
 IF_DEBUG(Print(_L(">>>TDpsGetCapability::FillRepArgs")));
 CDpsXmlParser* XmlPar = aTrader->Parser();
+TInt ret = KErrNone;
 if (aArgs.Count())
 {
 if (EDpsArgPaperTypes == aArgs[0].iElement ||
 EDpsArgLayouts == aArgs[0].iElement)
 {
 if (XmlPar->HasAttribute())
 {
 TDpsAttribute attrib;
 		        XmlPar->GetAttribute(attrib);
-		        iRepParam.iContent.Append(attrib);
+		        ret = iRepParam.iContent.Append(attrib);
 }
 else
 {
-iRepParam.iContent.Append(0);
+ret = iRepParam.iContent.Append(0);
 }
+if (ret != KErrNone)
+{
+IF_DEBUG(Print(_L("*** append error")));
+return ret;
+}
 }
 TUint32 value;
 TLex8 converter;
 TLex8 parser(aArgs[0].iContent);
 parser.SkipSpace();
 {
 TDpsPaperType paperType;
 TInt major = value >> KShiftLength;
 paperType.iMajor = (TDpsPaperTypeMajor)major;
 paperType.iMinor = (TDpsPaperTypeMinor)(value & KDpsMinorMask);
-iRepParam.iPaperType.Append(paperType);
+ret = iRepParam.iPaperType.Append(paperType);
 }
 else
 {
 // remove the extra zeros
 value = value >> KShiftLength;
-iRepParam.iContent.Append(value);
+ret = iRepParam.iContent.Append(value);
 IF_DEBUG(Print(_L("the value is %x"), value));
 }
+if (ret != KErrNone)
+{
+IF_DEBUG(Print(_L("*** append error")));
+return ret;
+}
 }
 iRepParam.iCap = aArgs[0].iElement;
 }
 error = aTrader->ConvertVersion(converter, version);
 if (error != KErrNone)
 {
 return error;
 }
-iRepParam.iDpsVersions.Append(version);
+error = iRepParam.iDpsVersions.Append(version);
+if (error != KErrNone)
+{
+IF_DEBUG(Print(_L("*** append error")));
+return error;
+}
 }
 break;
 case EDpsArgVendorName:
 iRepParam.iVendorName.Copy(aArgs[i].iContent);

branch	RCL_3
changeset 19	c00b160ac7eb
parent 0	1e05558e2206