Remove some unused forward lock code (9352d116) · Commits · e / os / android_frameworks_av

drm/libdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.c

+0 −31

Original line number	Diff line number	Diff line
		@@ -1314,34 +1314,3 @@ FwdLockConv_Status_t FwdLockConv_ConvertOpenFile(int inputFileDesc,
		}
		return status;
		}

		FwdLockConv_Status_t FwdLockConv_ConvertFile(const char *pInputFilename,
		const char *pOutputFilename,
		off64_t *pErrorPos) {
		FwdLockConv_Status_t status;
		if (pErrorPos != NULL) {
		*pErrorPos = INVALID_OFFSET;
		}
		if (pInputFilename == NULL \|\| pOutputFilename == NULL) {
		status = FwdLockConv_Status_InvalidArgument;
		} else {
		int inputFileDesc = open(pInputFilename, O_RDONLY);
		if (inputFileDesc < 0) {
		status = FwdLockConv_Status_FileNotFound;
		} else {
		int outputFileDesc = open(pOutputFilename, O_CREAT \| O_TRUNC \| O_WRONLY,
		S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IROTH);
		if (outputFileDesc < 0) {
		status = FwdLockConv_Status_FileCreationFailed;
		} else {
		status = FwdLockConv_ConvertOpenFile(inputFileDesc, read, outputFileDesc, write,
		lseek64, pErrorPos);
		if (close(outputFileDesc) == 0 && status != FwdLockConv_Status_OK) {
		remove(pOutputFilename);
		}
		}
		(void)close(inputFileDesc);
		}
		}
		return status;
		}

+0 −30

Original line number	Diff line number	Diff line
		@@ -245,36 +245,6 @@ FwdLockConv_Status_t FwdLockConv_ConvertOpenFile(int inputFileDesc,
		FwdLockConv_LSeekFunc_t *fpLSeekFunc,
		off64_t *pErrorPos);

		/**
		* Converts an OMA DRM v1 Forward Lock file to the internal Forward Lock file format in pull mode.
		*
		* @param[in] pInputFilename A reference to the input filename.
		* @param[in] pOutputFilename A reference to the output filename.
		* @param[out] pErrorPos
		* The file position where the error occurred, in the case of a syntax error. May be NULL.
		*
		* @return A status code.
		* @retval FwdLockConv_Status_OK
		* @retval FwdLockConv_Status_InvalidArgument
		* @retval FwdLockConv_Status_OutOfMemory
		* @retval FwdLockConv_Status_FileNotFound
		* @retval FwdLockConv_Status_FileCreationFailed
		* @retval FwdLockConv_Status_FileReadError
		* @retval FwdLockConv_Status_FileWriteError
		* @retval FwdLockConv_Status_FileSeekError
		* @retval FwdLockConv_Status_SyntaxError
		* @retval FwdLockConv_Status_UnsupportedFileFormat
		* @retval FwdLockConv_Status_UnsupportedContentTransferEncoding
		* @retval FwdLockConv_Status_RandomNumberGenerationFailed
		* @retval FwdLockConv_Status_KeyEncryptionFailed
		* @retval FwdLockConv_Status_DataEncryptionFailed
		* @retval FwdLockConv_Status_IntegrityProtectionFailed
		* @retval FwdLockConv_Status_TooManySessions
		*/
		FwdLockConv_Status_t FwdLockConv_ConvertFile(const char *pInputFilename,
		const char *pOutputFilename,
		off64_t *pErrorPos);

		#ifdef __cplusplus
		}
		#endif