fixed some warnings

code style of MMediaFilesManager.* 


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20703 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/media/DecoderPlugin.h

@@ -11,6 +11,7 @@ namespace BPrivate { namespace media {
 
 class ChunkProvider {
 public:
+	virtual			~ChunkProvider() {};
 	virtual status_t	GetNextChunk(const void **chunkBuffer, size_t *chunkSize,
 						             media_header *mediaHeader) = 0;
 };

src/kits/media/PluginManager.cpp

@@ -143,7 +143,7 @@ PluginManager::~PluginManager()
 {
 	CALLED();
 	while (!fPluginList->IsEmpty()) {
-		plugin_info *info;
+		plugin_info *info = NULL;
 		fPluginList->Get(fPluginList->CountItems() - 1, &info);
 		printf("PluginManager: Error, unloading PlugIn %s with usecount %d\n", info->name, info->usecount);
 		delete info->plugin;

src/servers/media/MMediaFilesManager.cpp

@@ -36,7 +36,7 @@ int32
 MMediaFilesManager::ReadPascalString(BFile &file, char **str)
 {
 	uint32 len;
-	*str=NULL;
+	*str = NULL;
 	if (file.Read(&len, 4) < 4)
 		return -1;
 	if (len == 0)
@@ -55,7 +55,7 @@ int32
 MMediaFilesManager::WritePascalString(BFile &file, const char *str)
 {
 
-	if(str == NULL)
+	if (str == NULL)
 		return -1;
 	uint32 len = strlen(str) + 1;
 	if (file.Write(&len, 4) < 4)
@@ -76,7 +76,7 @@ MMediaFilesManager::LoadState()
 	CALLED();
 	status_t err = B_OK;
 	BPath path;
-	if((err = find_directory(B_USER_SETTINGS_DIRECTORY, &path))!=B_OK)
+	if ((err = find_directory(B_USER_SETTINGS_DIRECTORY, &path)) != B_OK)
 		return err;
 
 	path.Append("Media/MMediaFilesManager");
@@ -121,9 +121,9 @@ MMediaFilesManager::LoadState()
 			//TRACE("        %s: %s, volume: %f\n", key, val, *(float *)&vol);
 
 			entry_ref ref;
-	        if(len>1) {
+			if (len > 1) {
 				BEntry entry(val);
-	        	if(entry.Exists())
+				if (entry.Exists())
 					entry.GetRef(&ref);
 			}
 			SetRefFor(str, key, ref, false);
@@ -145,7 +145,7 @@ MMediaFilesManager::SaveState()
 	CALLED();
 	status_t err = B_OK;
 	BPath path;
-	if((err = find_directory(B_USER_SETTINGS_DIRECTORY, &path))!=B_OK)
+	if ((err = find_directory(B_USER_SETTINGS_DIRECTORY, &path)) != B_OK)
 		return err;
 
 	path.Append("Media/MMediaFilesManager");
@@ -159,11 +159,11 @@ MMediaFilesManager::SaveState()
 	if (file.Write(&category_count, sizeof(uint32)) < (int32)sizeof(uint32))
 		return B_ERROR;
 
-	BString *type;
+	BString *type = NULL;
 	Map<BString, entry_ref> *map;
-	BString *item;
+	BString *item = NULL;
 	entry_ref *ref;
-	for (fRegistryMap->Rewind(); fRegistryMap->GetNext(&map); ) {
+	for (fRegistryMap->Rewind(); fRegistryMap->GetNext(&map);) {
 		fRegistryMap->GetCurrentKey(&type);
 
 		WritePascalString(file, type->String());
@@ -194,11 +194,11 @@ MMediaFilesManager::Dump()
 	/* for each type, the registry map contains a map of item/entry_ref
 	 */
 	printf("MMediaFilesManager: registry map follows\n");
-	BString *type;
+	BString *type = NULL;
 	Map<BString, entry_ref> *map;
-	BString *item;
+	BString *item = NULL;
 	entry_ref *ref;
-	for (fRegistryMap->Rewind(); fRegistryMap->GetNext(&map); ) {
+	for (fRegistryMap->Rewind(); fRegistryMap->GetNext(&map);) {
 		fRegistryMap->GetCurrentKey(&type);
 
 		for (map->Rewind(); map->GetNext(&ref);) {
@@ -218,17 +218,17 @@ status_t
 MMediaFilesManager::RewindTypes(BString ***types, int32 *count)
 {
 	CALLED();
-	if(types==NULL || count == NULL)
+	if (types == NULL || count == NULL)
 		return B_BAD_VALUE;
 
 	Map<BString, entry_ref> *map;
-	BString *type;
+	BString *type = NULL;
 
 	*count = fRegistryMap->CountItems();
 	*types = new BString*[*count];
-	int32 i=0; 
+	int32 i = 0;
 
-	for (fRegistryMap->Rewind(); i<*count && fRegistryMap->GetNext(&map); i++) {
+	for (fRegistryMap->Rewind(); i < *count && fRegistryMap->GetNext(&map); i++) {
 		fRegistryMap->GetCurrentKey(&type);
 		(*types)[i] = type;
 	}
@@ -241,12 +241,12 @@ status_t
 MMediaFilesManager::RewindRefs(const char* type, BString ***items, int32 *count)
 {
 	CALLED();
-	if(type == NULL || items==NULL || count == NULL)
+	if (type == NULL || items == NULL || count == NULL)
 		return B_BAD_VALUE;
 
-	Map<BString, entry_ref> *map;
+	Map<BString, entry_ref> *map = NULL;
 	entry_ref *ref;
-	BString *item;
+	BString *item = NULL;
 
 	*count = 0;
 	*items = NULL;
@@ -256,9 +256,9 @@ MMediaFilesManager::RewindRefs(const char* type, BString ***items, int32 *count)
 
 	*count = map->CountItems();
 	*items = new BString*[*count];
-	int32 i=0;
+	int32 i = 0;
 
-	for (map->Rewind(); i<*count && map->GetNext(&ref); i++) {
+	for (map->Rewind(); i < *count && map->GetNext(&ref); i++) {
 		map->GetCurrentKey(&item);
 		(*items)[i] = item;
 	}
@@ -273,11 +273,11 @@ MMediaFilesManager::GetRefFor(const char *type,
 	entry_ref **out_ref)
 {
 	CALLED();
-	Map <BString, entry_ref> *map;
+	Map <BString, entry_ref> *map = NULL;
-	if(!fRegistryMap->Get(BString(type), &map))
+	if (!fRegistryMap->Get(BString(type), &map))
 		return B_ENTRY_NOT_FOUND;
 
-	if(!map->Get(BString(item), out_ref))
+	if (!map->Get(BString(item), out_ref))
 		return B_ENTRY_NOT_FOUND;
 
 	return B_OK;
@@ -296,16 +296,16 @@ MMediaFilesManager::SetRefFor(const char *type,
 	itemString.Truncate(B_MEDIA_NAME_LENGTH);
 	BString typeString(type);
 	Map <BString, entry_ref> *map;
-	if(!fRegistryMap->Get(typeString, &map)) {
+	if (!fRegistryMap->Get(typeString, &map)) {
 		map = new Map<BString, entry_ref>;
 		fRegistryMap->Insert(typeString, *map);
 		fRegistryMap->Get(typeString, &map);
 	}
 
-	if(map->Has(itemString))
+	if (map->Has(itemString))
 		map->Remove(itemString);
 	map->Insert(itemString, ref);
-	if(save)
+	if (save)
 		LaunchTimer();
 
 	return B_OK;
@@ -321,7 +321,7 @@ MMediaFilesManager::RemoveRefFor(const char *type,
 	BString itemString(item);
 	BString typeString(type);
 	Map <BString, entry_ref> *map;
-	if(fRegistryMap->Get(typeString, &map)) {
+	if (fRegistryMap->Get(typeString, &map)) {
 		map->Remove(itemString);
 		map->Insert(itemString, *(new entry_ref));
 		LaunchTimer();
@@ -338,7 +338,7 @@ MMediaFilesManager::RemoveItem(const char *type,
 	BString itemString(item);
 	BString typeString(type);
 	Map <BString, entry_ref> *map;
-	if(fRegistryMap->Get(typeString, &map)) {
+	if (fRegistryMap->Get(typeString, &map)) {
 		map->Remove(itemString);
 		LaunchTimer();
 	}
@@ -349,9 +349,9 @@ MMediaFilesManager::RemoveItem(const char *type,
 void
 MMediaFilesManager::LaunchTimer()
 {
-	if(!fRunner)
+	if (!fRunner)
 		fRunner = new BMessageRunner(be_app,
-			new BMessage(MMEDIAFILESMANAGER_SAVE_TIMER), 3 * 1000000, 1);	
+			new BMessage(MMEDIAFILESMANAGER_SAVE_TIMER), 3 * 1000000LL, 1);
 }
 
 

src/servers/media/MMediaFilesManager.h

@@ -15,7 +15,7 @@
 
 class MMediaFilesManager
 {
-public:
+	public:
 		MMediaFilesManager();
 		~MMediaFilesManager();
 
@@ -40,22 +40,22 @@ public:
 			const char * item,
 			const entry_ref & ref,
 			bool save = true);
-	status_t RemoveRefFor(		//	This might better be called "ClearRefFor"
+		status_t RemoveRefFor(
-				const char * type,		//	but it's too late now...
+			const char * type,
 			const char * item,
 			const entry_ref & ref);
 
-	status_t RemoveItem(		//	new in 4.1, removes the whole item.
+		status_t RemoveItem(
 			const char * type,
 			const char * item);
 
 		void TimerMessage();
 
-private:
+	private:
 		static int32 ReadPascalString(BFile &file, char **str);
 		static int32 WritePascalString(BFile &file, const char *str);
 		void LaunchTimer();
-private:
+	private:
 		BLocker *fLocker;
 
 		Map<BString, Map<BString, entry_ref> > * fRegistryMap;