* Only allowed application hints of B_MIME_TYPE_LENGTH instead of B_PATH_NAME_LENGTH.

* Introduced a _SetStringValue() to avoid code duplication.
* The string types now check the original value, and don't write anything if the
  contents stay unchanged (with the current exception of the sniffer rules).
* The monitor notfication methods no longer "clobber" the status result.
* Major cleanup.


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

headers/private/storage/mime/Database.h

@@ -1,15 +1,14 @@
-//----------------------------------------------------------------------
+/*
-//  This software is part of the OpenBeOS distribution and is covered 
+ * Copyright 2002-2006, Haiku.
-//  by the OpenBeOS license.
+ * Distributed under the terms of the MIT License.
-//---------------------------------------------------------------------
+ *
-/*!
+ * Authors:
-	\file Database.cpp
+ *		Tyler Dauwalder
-	Database class declarations
  */
-
 #ifndef _MIME_DATABASE_H
 #define _MIME_DATABASE_H
 
+
 #include <Mime.h>
 #include <mime/AssociatedTypes.h>
 #include <mime/InstalledTypes.h>
@@ -57,10 +56,12 @@ public:
 		status_t SetShortDescription(const char *type, const char *description);	
 		status_t SetLongDescription(const char *type, const char *description);
 		status_t SetFileExtensions(const char *type, const BMessage *extensions);
-	status_t SetIcon(const char *type, const void *data, size_t dataSize, icon_size which);
+		status_t SetIcon(const char *type, const void *data, size_t dataSize,
+					icon_size which);
 		status_t SetIconForType(const char *type, const char *fileType, const void *data,
 					size_t dataSize, icon_size which);
-	status_t SetPreferredApp(const char *type, const char *signature, app_verb verb = B_OPEN);
+		status_t SetPreferredApp(const char *type, const char *signature,
+					app_verb verb = B_OPEN);
 		status_t SetSnifferRule(const char *type, const char *rule);
 		status_t SetSupportedTypes(const char *type, const BMessage *types, bool fullSync);
 
@@ -88,25 +89,31 @@ public:
 		status_t DeleteLongDescription(const char *type);
 		status_t DeleteFileExtensions(const char *type);
 		status_t DeleteIcon(const char *type, icon_size size);
-	status_t DeleteIconForType(const char *type, const char *fileType, icon_size which);
+		status_t DeleteIconForType(const char *type, const char *fileType,
+					icon_size which);
 		status_t DeletePreferredApp(const char *type, app_verb verb = B_OPEN);
 		status_t DeleteSnifferRule(const char *type);
 		status_t DeleteSupportedTypes(const char *type, bool fullSync);
 
 	private:
-	// Functions to send monitor notifications
+		status_t _SetStringValue(const char *type, int32 what,
-	status_t SendInstallNotification(const char *type);
+					const char* attribute, type_code attributeType,
-	status_t SendDeleteNotification(const char *type);	
+					size_t maxLength, const char *value);
-	status_t SendMonitorUpdate(int32 which, const char *type, const char *extraType,
-	                             bool largeIcon, int32 action);
-	status_t SendMonitorUpdate(int32 which, const char *type, const char *extraType,
-	                             int32 action);
-	status_t SendMonitorUpdate(int32 which, const char *type, bool largeIcon,
-	                             int32 action);
-	status_t SendMonitorUpdate(int32 which, const char *type,
-	                             int32 action);
-	status_t SendMonitorUpdate(BMessage &msg);
 
+		// Functions to send monitor notifications
+		status_t _SendInstallNotification(const char *type);
+		status_t _SendDeleteNotification(const char *type);	
+		status_t _SendMonitorUpdate(int32 which, const char *type,
+					const char *extraType, bool largeIcon, int32 action);
+		status_t _SendMonitorUpdate(int32 which, const char *type,
+					const char *extraType, int32 action);
+		status_t _SendMonitorUpdate(int32 which, const char *type,
+					bool largeIcon, int32 action);
+		status_t _SendMonitorUpdate(int32 which, const char *type,
+					int32 action);
+		status_t _SendMonitorUpdate(BMessage &msg);
+
+	private:
 		status_t fStatus;
 		std::set<BMessenger> fMonitorMessengers;
 		AssociatedTypes fAssociatedTypes;

src/kits/storage/mime/database_access.cpp

@@ -54,16 +54,20 @@ namespace Mime {
 status_t
 get_app_hint(const char *type, entry_ref *ref)
 {
-	char path[B_MIME_TYPE_LENGTH];
+	if (type == NULL || ref == NULL)
+		return B_BAD_VALUE;
+
+	char path[B_PATH_NAME_LENGTH];
 	BEntry entry;
-	ssize_t err = ref ? B_OK : B_BAD_VALUE;
+	ssize_t status = read_mime_attr(type, kAppHintAttr, path,
-	if (!err)
+		B_PATH_NAME_LENGTH, kAppHintType);
-		err = read_mime_attr(type, kAppHintAttr, path, B_MIME_TYPE_LENGTH, kAppHintType);
+
-	if (err >= 0)
+	if (status >= B_OK)
-		err = entry.SetTo(path);
+		status = entry.SetTo(path);
-	if (!err)
+	if (status == B_OK)
-		err = entry.GetRef(ref);		
+		status = entry.GetRef(ref);		
-	return err;
+
+	return status;
 }
 
 // get_attr_info