Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Side by Side Diff: chrome/common/unix_domain_socket_posix.cc

Issue 6609008: Change other usages of .size() to .empty() when applicable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Peter nits Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/extensions/user_script.cc ('k') | chrome/common/web_apps_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/unix_domain_socket_posix.h" 5 #include "chrome/common/unix_domain_socket_posix.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <unistd.h> 8 #include <unistd.h>
9 #include <sys/uio.h> 9 #include <sys/uio.h>
10 #include <sys/socket.h> 10 #include <sys/socket.h>
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 return -1; 120 return -1;
121 } 121 }
122 close(fds[1]); 122 close(fds[1]);
123 123
124 fd_vector.clear(); 124 fd_vector.clear();
125 const ssize_t reply_len = RecvMsg(fds[0], reply, max_reply_len, &fd_vector); 125 const ssize_t reply_len = RecvMsg(fds[0], reply, max_reply_len, &fd_vector);
126 close(fds[0]); 126 close(fds[0]);
127 if (reply_len == -1) 127 if (reply_len == -1)
128 return -1; 128 return -1;
129 129
130 if ((fd_vector.size() > 0 && result_fd == NULL) || fd_vector.size() > 1) { 130 if ((!fd_vector.empty() && result_fd == NULL) || fd_vector.size() > 1) {
131 for (std::vector<int>::const_iterator 131 for (std::vector<int>::const_iterator
132 i = fd_vector.begin(); i != fd_vector.end(); ++i) { 132 i = fd_vector.begin(); i != fd_vector.end(); ++i) {
133 close(*i); 133 close(*i);
134 } 134 }
135 135
136 NOTREACHED(); 136 NOTREACHED();
137 137
138 return -1; 138 return -1;
139 } 139 }
140 140
141 if (result_fd) { 141 if (result_fd)
142 if (fd_vector.empty()) { 142 *result_fd = fd_vector.empty() ? -1 : fd_vector[0];
143 *result_fd = -1;
144 } else {
145 *result_fd = fd_vector[0];
146 }
147 }
148 143
149 return reply_len; 144 return reply_len;
150 } 145 }
151 146
OLDNEW
« no previous file with comments | « chrome/common/extensions/user_script.cc ('k') | chrome/common/web_apps_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698