[haiku-commits] r35690 - haiku/trunk/src/apps/mail
- From: jonas@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 1 Mar 2010 01:48:47 +0100 (CET)
Author: kirilla
Date: 2010-03-01 01:48:47 +0100 (Mon, 01 Mar 2010)
New Revision: 35690
Changeset: http://dev.haiku-os.org/changeset/35690/haiku
Modified:
haiku/trunk/src/apps/mail/Utilities.cpp
haiku/trunk/src/apps/mail/Utilities.h
Log:
Clean-up.
Modified: haiku/trunk/src/apps/mail/Utilities.cpp
===================================================================
--- haiku/trunk/src/apps/mail/Utilities.cpp 2010-03-01 00:43:13 UTC (rev
35689)
+++ haiku/trunk/src/apps/mail/Utilities.cpp 2010-03-01 00:48:47 UTC (rev
35690)
@@ -32,41 +32,34 @@
All rights reserved.
*/
-//--------------------------------------------------------------------
-//
-// Utilities.cpp
-//
-//--------------------------------------------------------------------
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "Utilities.h"
-#include <Alert.h>
-#include <String.h>
+#include <fs_attr.h>
#include <Node.h>
+#include <String.h>
#include <TypeConstants.h>
-#include <fs_attr.h>
-#include <MailMessage.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
-#include "Utilities.h"
-
status_t
-WriteAttrString(BNode *node, const char *attr, const char *value)
+WriteAttrString(BNode* node, const char* attr, const char* value)
{
if (!value)
value = B_EMPTY_STRING;
- ssize_t size = node->WriteAttr(attr, B_STRING_TYPE, 0, value,
strlen(value) + 1);
+ ssize_t size = node->WriteAttr(attr, B_STRING_TYPE, 0, value,
+ strlen(value) + 1);
return size >= 0 ? B_OK : size;
}
status_t
-ReadAttrString(BNode *node, const char *attr, BString *value)
+ReadAttrString(BNode* node, const char* attr, BString* value)
{
attr_info attrInfo;
@@ -75,7 +68,9 @@
if (status < B_OK)
return status;
- ssize_t size = node->ReadAttr(attr, B_STRING_TYPE, 0,
value->LockBuffer(attrInfo.size + 1), attrInfo.size);
+ ssize_t size = node->ReadAttr(attr, B_STRING_TYPE, 0,
+ value->LockBuffer(attrInfo.size + 1), attrInfo.size);
+
value->UnlockBuffer();
return size >= 0 ? B_OK : size;
@@ -87,7 +82,7 @@
//
int32
-cistrcmp(const char *str1, const char *str2)
+cistrcmp(const char* str1, const char* str2)
{
char c1;
char c2;
@@ -95,21 +90,19 @@
int32 loop;
len = strlen(str1) + 1;
- for (loop = 0; loop < len; loop++)
- {
+ for (loop = 0; loop < len; loop++) {
c1 = str1[loop];
if (c1 >= 'A' && c1 <= 'Z')
c1 += 'a' - 'A';
c2 = str2[loop];
if (c2 >= 'A' && c2 <= 'Z')
c2 += 'a' - 'A';
- if (c1 == c2)
- {
- }
- else if (c1 < c2)
+ if (c1 == c2) {
+ } else if (c1 < c2) {
return -1;
- else if (c1 > c2 || !c2)
+ } else if (c1 > c2 || !c2) {
return 1;
+ }
}
return 0;
}
@@ -120,27 +113,25 @@
//
int32
-cistrncmp(const char *str1, const char *str2, int32 max)
+cistrncmp(const char* str1, const char* str2, int32 max)
{
char c1;
char c2;
int32 loop;
- for (loop = 0; loop < max; loop++)
- {
+ for (loop = 0; loop < max; loop++) {
c1 = *str1++;
if (c1 >= 'A' && c1 <= 'Z')
c1 += 'a' - 'A';
c2 = *str2++;
if (c2 >= 'A' && c2 <= 'Z')
c2 += 'a' - 'A';
- if (c1 == c2)
- {
- }
- else if (c1 < c2)
+ if (c1 == c2) {
+ } else if (c1 < c2) {
return -1;
- else if (c1 > c2 || !c2)
+ } else if (c1 > c2 || !c2) {
return 1;
+ }
}
return 0;
}
@@ -150,8 +141,8 @@
// case-insensitive version of strstr
//
-char *
-cistrstr(const char *cs, const char *ct)
+char*
+cistrstr(const char* cs, const char* ct)
{
char c1;
char c2;
@@ -162,13 +153,11 @@
cs_len = strlen(cs);
ct_len = strlen(ct);
- for (loop1 = 0; loop1 < cs_len; loop1++)
- {
+ for (loop1 = 0; loop1 < cs_len; loop1++) {
if (cs_len - loop1 < ct_len)
return NULL;
- for (loop2 = 0; loop2 < ct_len; loop2++)
- {
+ for (loop2 = 0; loop2 < ct_len; loop2++) {
c1 = cs[loop1 + loop2];
if ((c1 >= 'A') && (c1 <= 'Z'))
c1 += ('a' - 'A');
@@ -178,7 +167,7 @@
if (c1 != c2)
goto next;
}
- return const_cast<char *>(&cs[loop1]);
+ return const_cast<char*>(&cs[loop1]);
next:
// label must be followed by a statement
;
@@ -192,14 +181,12 @@
//
int32
-linelen(char *str, int32 len, bool header)
+linelen(char* str, int32 len, bool header)
{
int32 loop;
- for (loop = 0; loop < len; loop++)
- {
- if (str[loop] == '\n')
- {
+ for (loop = 0; loop < len; loop++) {
+ if (str[loop] == '\n') {
if (!header || loop < 2
|| (header && str[loop + 1] != ' ' && str[loop
+ 1] != '\t'))
return loop + 1;
Modified: haiku/trunk/src/apps/mail/Utilities.h
===================================================================
--- haiku/trunk/src/apps/mail/Utilities.h 2010-03-01 00:43:13 UTC (rev
35689)
+++ haiku/trunk/src/apps/mail/Utilities.h 2010-03-01 00:48:47 UTC (rev
35690)
@@ -31,40 +31,27 @@
names are registered trademarks or trademarks of their respective holders.
All rights reserved.
*/
-
-
-//--------------------------------------------------------------------
-//
-// Utilities.h
-//
-//--------------------------------------------------------------------
-
#ifndef _UTILITIES_H
#define _UTILITIES_H
+
#include <SupportDefs.h>
-class BEmailMessage;
-//====================================================================
+class BNode;
+class BString;
-#ifdef __cplusplus
-class BNode;
-extern status_t WriteAttrString(BNode *node, const char *attr, const char
*value);
-extern status_t ReadAttrString(BNode *node, const char *attr, BString *value);
+extern status_t WriteAttrString(BNode* node, const char* attr,
+ const char* value);
+extern status_t ReadAttrString(BNode* node, const char* attr, BString* value);
-extern "C" {
-#endif
-int32 cistrcmp(const char *, const char *);
-int32 cistrncmp(const char *, const char *, int32);
-char *cistrstr(const char *, const char *);
+int32 cistrcmp(const char*, const char*);
+int32 cistrncmp(const char*, const char*, int32);
+char* cistrstr(const char*, const char*);
int32 linelen(char*, int32, bool);
-#ifdef __cplusplus
-}
-#endif
#endif // #ifndef _UTILITIES_H
Other related posts:
- » [haiku-commits] r35690 - haiku/trunk/src/apps/mail - jonas
