Changeset 25468

Timestamp:

05/12/08 09:27:56 (6 months ago)

Author:

jackburton

Message:

Removed PortQueue since it's not used. Small style (old) changes here
and there.

Location:

haiku/trunk

Files:

• headers/private/app/PortQueue.h (deleted)
• src/kits/app/Application.cpp (modified) (4 diffs)
• src/kits/app/LinkReceiver.cpp (modified) (5 diffs)
• src/kits/app/LinkSender.cpp (modified) (2 diffs)
• src/kits/app/PortQueue.cpp (deleted)

haiku/trunk/src/kits/app/Application.cpp

@@ -209 +209 @@
         if (data->FindInt64("_pulse", &pulseRate) == B_OK)
                 SetPulseRate(pulseRate);
-
 }
 
@@ -862 +861 @@
 BApplication::GetAppInfo(app_info *info) const
 {
+        if (be_app == NULL || be_roster == NULL)
+                return B_NO_INIT;
         return be_roster->GetRunningAppInfo(be_app->Team(), info);
 }
@@ -880 +881 @@
 
         // App is already running. Get its entry ref with
-        // GetRunningAppInfo()  
+        // GetAppInfo() 
         app_info appInfo;
-        if (be_app && be_roster->GetRunningAppInfo(be_app->Team(), &appInfo) == B_OK) {
+        if (be_app && be_app->GetAppInfo(&appInfo) == B_OK) {
                 ref = appInfo.ref;
                 found = true;
@@ -890 +891 @@
         }
 
-        if (found) {
-                BFile file(&ref, B_READ_ONLY);
-                if (file.InitCheck() == B_OK) {
-                        BResources *resources = new BResources();
-                        if (resources->SetTo(&file, false) < B_OK)
-                                delete resources;
-                        else
-                                sAppResources = resources;                      
+        if (!found)
+                return NULL;
+        
+        BFile file(&ref, B_READ_ONLY);
+        if (file.InitCheck() == B_OK) {
+                sAppResources = new (nothrow) BResources(&file, false);
+                if (sAppResources != NULL
+                        && sAppResources->InitCheck() != B_OK) {
+                        delete sAppResources;
+                        sAppResources = NULL;
                 }
         }

haiku/trunk/src/kits/app/LinkReceiver.cpp

@@ -59 +59 @@
 LinkReceiver::GetNextMessage(int32 &code, bigtime_t timeout)
 {
-        int32 remaining;
-
         fReadError = B_OK;
 
-        remaining = fDataSize - (fRecvStart + fReplySize);
+        int32 remaining = fDataSize - (fRecvStart + fReplySize);
         STRACE(("info: LinkReceiver GetNextReply() reports %ld bytes remaining in buffer.\n", remaining));
 
@@ -278 +276 @@
 {
         int32 length = 0;
-        status_t status;
-
-        status = Read<int32>(&length);
+        status_t status = Read<int32>(&length);
+
         if (status < B_OK)
                 return status;
 
         char *string;
-
         if (length < 0) {
                 status = B_ERROR;
@@ -310 +306 @@
         if (_length)
                 *_length = length;
+        
         *_string = string;
 
@@ -325 +322 @@
 {
         int32 length = 0;
-        status_t status;
-
-        status = Read<int32>(&length);
+        status_t status = Read<int32>(&length);
+
         if (status < B_OK)
                 return status;
@@ -371 +367 @@
 {
         int32 length = 0;
-        status_t status;
-
-        status = Read<int32>(&length);
+        status_t status = Read<int32>(&length);
+
         if (status < B_OK)
                 return status;

haiku/trunk/src/kits/app/LinkSender.cpp

@@ -196 +196 @@
         else if (newSize > kInitialBufferSize)
                 newSize = (newSize + B_PAGE_SIZE - 1) & ~(B_PAGE_SIZE - 1);
-
-        char *buffer = NULL;
+        
         if (newSize == fBufferSize) {
                 // keep existing buffer
@@ -206 +205 @@
 
         // create new larger buffer
-        buffer = (char *)malloc(newSize);
+        char *buffer = (char *)malloc(newSize);
         if (buffer == NULL)
                 return B_NO_MEMORY;