You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by gr...@apache.org on 2011/01/25 21:39:58 UTC
svn commit: r1063447 - in /incubator/etch/trunk/binding-cpp/runtime:
include/util/EtchUtil.h src/main/util/EtchUtil.cpp
Author: grandyho
Date: Tue Jan 25 20:39:58 2011
New Revision: 1063447
URL: http://svn.apache.org/viewvc?rev=1063447&view=rev
Log:
ETCH-149
changed indent style to 4 spaces for tabs
Modified:
incubator/etch/trunk/binding-cpp/runtime/include/util/EtchUtil.h
incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchUtil.cpp
Modified: incubator/etch/trunk/binding-cpp/runtime/include/util/EtchUtil.h
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/include/util/EtchUtil.h?rev=1063447&r1=1063446&r2=1063447&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/include/util/EtchUtil.h (original)
+++ incubator/etch/trunk/binding-cpp/runtime/include/util/EtchUtil.h Tue Jan 25 20:39:58 2011
@@ -1,19 +1,19 @@
-/* $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+/* $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
#ifndef __ETCHUTIL_H__
@@ -23,7 +23,7 @@
/*
* copy src to dst. Copies at most dst_size bytes. In case that
- * dst is not long enough, dst will be '\0'.
+ * dst is not long enough, dst will be '\0'.
* Asserts that dstSize is length of dst.
*/
status_t etch_strcpy_s(char *dst, size_t dstSize, const char *src);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchUtil.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchUtil.cpp?rev=1063447&r1=1063446&r2=1063447&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchUtil.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/util/EtchUtil.cpp Tue Jan 25 20:39:58 2011
@@ -1,50 +1,49 @@
-/* $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+/* $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
#include "util/EtchUtil.h"
-status_t etch_strcpy_s(char *dst, size_t dstSize, const char *src)
-{
- char *d, *end;
-
- if (dst == NULL || src == NULL) {
- return ETCH_EINVAL;
- }
-
- if (dstSize == 0) {
- return ETCH_ERANGE;
- }
-
- d = dst;
- end = dst + dstSize - 1;
-
- for (; d < end; ++d, ++src) {
- if (!(*d = *src)) {
- return ETCH_OK;
+status_t etch_strcpy_s(char *dst, size_t dstSize, const char *src) {
+ char *d, *end;
+
+ if (dst == NULL || src == NULL) {
+ return ETCH_EINVAL;
+ }
+
+ if (dstSize == 0) {
+ return ETCH_ERANGE;
+ }
+
+ d = dst;
+ end = dst + dstSize - 1;
+
+ for (; d < end; ++d, ++src) {
+ if (!(*d = *src)) {
+ return ETCH_OK;
+ }
+ }
+
+ // if src buffer is not 0 now, then we have bytes left in src --> error
+ if(! (*d = *src)) {
+ return ETCH_OK;
+ } else {
+ // always null terminate
+ *d = '\0';
+ return ETCH_EINVAL;
}
- }
-
- // if src buffer is not 0 now, then we have bytes left in src --> error
- if(! (*d = *src)) {
- return ETCH_OK;
- } else {
- // always null terminate
- *d = '\0';
- return ETCH_EINVAL;
- }
}