You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/06/23 21:39:52 UTC
[lucy-commits] svn commit: r1139047 - in /incubator/lucy/trunk/clownfish/src: CFCClass.c
CFCDumpable.c CFCFile.c CFCHierarchy.c CFCMethod.c
Author: marvin
Date: Thu Jun 23 19:39:52 2011
New Revision: 1139047
URL: http://svn.apache.org/viewvc?rev=1139047&view=rev
Log:
Don't bother checking the return value from sprintf().
Modified:
incubator/lucy/trunk/clownfish/src/CFCClass.c
incubator/lucy/trunk/clownfish/src/CFCDumpable.c
incubator/lucy/trunk/clownfish/src/CFCFile.c
incubator/lucy/trunk/clownfish/src/CFCHierarchy.c
incubator/lucy/trunk/clownfish/src/CFCMethod.c
Modified: incubator/lucy/trunk/clownfish/src/CFCClass.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCClass.c?rev=1139047&r1=1139046&r2=1139047&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCClass.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCClass.c Thu Jun 23 19:39:52 2011
@@ -169,15 +169,12 @@ CFCClass_do_create(CFCClass *self, struc
self->short_vtable_var[i] = toupper(self->struct_sym[i]);
}
self->short_vtable_var[struct_sym_len] = '\0';
- int check = sprintf(self->full_struct_sym, "%s%s", prefix,
- self->struct_sym);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(self->full_struct_sym, "%s%s", prefix, self->struct_sym);
for (i = 0; self->full_struct_sym[i] != '\0'; i++) {
self->full_vtable_var[i] = toupper(self->full_struct_sym[i]);
}
self->full_vtable_var[i] = '\0';
- check = sprintf(self->full_vtable_type, "%s_VT", self->full_vtable_var);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(self->full_vtable_type, "%s_VT", self->full_vtable_var);
// Cache the relative path to the autogenerated C header file.
size_t source_class_len = strlen(self->source_class);
@@ -292,8 +289,7 @@ CFCClass_fetch_singleton(CFCParcel *parc
croak("names too long: '%s', '%s'", prefix, struct_sym);
}
char key[MAX_LEN + 1];
- int check = sprintf(key, "%s%s", prefix, struct_sym);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(key, "%s%s", prefix, struct_sym);
size_t i;
for (i = 0; i < registry_size; i++) {
if (strcmp(registry[i].key, key) == 0) {
Modified: incubator/lucy/trunk/clownfish/src/CFCDumpable.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCDumpable.c?rev=1139047&r1=1139046&r2=1139047&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCDumpable.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCDumpable.c Thu Jun 23 19:39:52 2011
@@ -180,9 +180,8 @@ S_add_dump_method(CFCClass *klass) {
+ strlen(cnick)
+ 50;
char *autocode = (char*)MALLOCATE(amount);
- int check = sprintf(autocode, pattern, full_func_sym, full_struct,
- full_typedef, full_typedef, vtable_var, cnick);
- if (check < 0) { CFCUtil_die("sprintf failed"); }
+ sprintf(autocode, pattern, full_func_sym, full_struct, full_typedef,
+ full_typedef, vtable_var, cnick);
CFCClass_append_autocode(klass, autocode);
FREEMEM(autocode);
CFCVariable **novel = CFCClass_novel_member_vars(klass);
@@ -205,8 +204,7 @@ S_add_dump_method(CFCClass *klass) {
+ strlen(full_struct)
+ 50;
char *autocode = (char*)MALLOCATE(amount);
- int check = sprintf(autocode, pattern, full_func_sym, full_struct);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(autocode, pattern, full_func_sym, full_struct);
CFCClass_append_autocode(klass, autocode);
FREEMEM(autocode);
CFCVariable **members = CFCClass_member_vars(klass);
@@ -249,10 +247,8 @@ S_add_load_method(CFCClass *klass) {
+ strlen(cnick)
+ 50;
char *autocode = (char*)MALLOCATE(amount);
- int check = sprintf(autocode, pattern, full_func_sym, full_struct,
- full_typedef, full_typedef, vtable_var, cnick,
- full_struct, full_struct);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(autocode, pattern, full_func_sym, full_struct, full_typedef,
+ full_typedef, vtable_var, cnick, full_struct, full_struct);
CFCClass_append_autocode(klass, autocode);
FREEMEM(autocode);
CFCVariable **novel = CFCClass_novel_member_vars(klass);
@@ -278,9 +274,8 @@ S_add_load_method(CFCClass *klass) {
+ strlen(full_struct) * 3
+ 50;
char *autocode = (char*)MALLOCATE(amount);
- int check = sprintf(autocode, pattern, full_func_sym, full_struct,
- full_struct, full_struct);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(autocode, pattern, full_func_sym, full_struct, full_struct,
+ full_struct);
CFCClass_append_autocode(klass, autocode);
FREEMEM(autocode);
CFCVariable **members = CFCClass_member_vars(klass);
@@ -321,8 +316,7 @@ S_process_dump_member(CFCClass *klass, C
croak("Buffer not big enough (%lu < %lu)",
(unsigned long)buf_size, (unsigned long)needed);
}
- int check = sprintf(buf, pattern, name, name_len, name);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(buf, pattern, name, name_len, name);
}
else if (CFCType_is_object(type)) {
char pattern[] =
@@ -335,8 +329,7 @@ S_process_dump_member(CFCClass *klass, C
croak("Buffer not big enough (%lu < %lu)",
(unsigned long)buf_size, (unsigned long)needed);
}
- int check = sprintf(buf, pattern, name, name, name_len, name);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(buf, pattern, name, name, name_len, name);
}
else {
croak("Don't know how to dump a %s", CFCType_get_specifier(type));
@@ -367,19 +360,16 @@ S_process_load_member(CFCClass *klass, C
croak("type_str too long: '%s'", type_str);
}
if (CFCType_is_integer(type)) {
- int check = sprintf(extraction, "(%s)Cfish_Obj_To_I64(var)", type_str);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(extraction, "(%s)Cfish_Obj_To_I64(var)", type_str);
}
else if (CFCType_is_floating(type)) {
- int check = sprintf(extraction, "(%s)Cfish_Obj_To_F64(var)", type_str);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(extraction, "(%s)Cfish_Obj_To_F64(var)", type_str);
}
else if (CFCType_is_object(type)) {
const char *vtable_var = CFCType_get_vtable_var(type);
- int check = sprintf(extraction,
- "(%s*)CFISH_CERTIFY(Cfish_Obj_Load(var, var), %s)",
- specifier, vtable_var);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(extraction,
+ "(%s*)CFISH_CERTIFY(Cfish_Obj_Load(var, var), %s)",
+ specifier, vtable_var);
}
else {
croak("Don't know how to load %s", specifier);
@@ -398,8 +388,7 @@ S_process_load_member(CFCClass *klass, C
croak("Buffer not big enough (%lu < %lu)", (unsigned long)buf_size,
(unsigned long)needed);
}
- int check = sprintf(buf, pattern, name, name_len, name, extraction);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(buf, pattern, name, name_len, name, extraction);
CFCClass_append_autocode(klass, buf);
}
Modified: incubator/lucy/trunk/clownfish/src/CFCFile.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCFile.c?rev=1139047&r1=1139046&r2=1139047&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCFile.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCFile.c Thu Jun 23 19:39:52 2011
@@ -86,12 +86,9 @@ CFCFile_init(CFCFile *self, const char *
}
}
self->guard_name[j] = '\0';
- int check = sprintf(self->guard_start, "#ifndef %s\n#define %s 1\n",
- self->guard_name, self->guard_name);
- if (check < 0) { croak("sprintf failed"); }
- check = sprintf(self->guard_close, "#endif /* %s */\n",
- self->guard_name);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(self->guard_start, "#ifndef %s\n#define %s 1\n", self->guard_name,
+ self->guard_name);
+ sprintf(self->guard_close, "#endif /* %s */\n", self->guard_name);
// Cache partial path derived from source_class.
self->path_part = (char*)MALLOCATE(len + 1);
@@ -179,13 +176,10 @@ S_some_path(CFCFile *self, char *buf, si
croak("Need buf_size of %lu, but got %lu", needed, buf_size);
}
if (base_dir) {
- int check = sprintf(buf, "%s" PATH_SEP "%s%s", base_dir,
- self->path_part, ext);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(buf, "%s" PATH_SEP "%s%s", base_dir, self->path_part, ext);
}
else {
- int check = sprintf(buf, "%s%s", self->path_part, ext);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(buf, "%s%s", self->path_part, ext);
}
size_t i;
for (i = 0; buf[i] != '\0'; i++) {
Modified: incubator/lucy/trunk/clownfish/src/CFCHierarchy.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCHierarchy.c?rev=1139047&r1=1139046&r2=1139047&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCHierarchy.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCHierarchy.c Thu Jun 23 19:39:52 2011
@@ -200,7 +200,6 @@ S_find_cfh(char *dir, char **cfh_list, s
full_path = (char*)MALLOCATE(full_path_cap);
}
int full_path_len = sprintf(full_path, "%s" PATH_SEP "%s", dir, entry);
- if (full_path_len < 0) { CFCUtil_die("sprintf failed"); }
const char *cfh_suffix = strstr(full_path, ".cfh");
if (cfh_suffix == full_path + (full_path_len - 4)) {
@@ -505,8 +504,7 @@ S_opendir(const char *dir) {
dh->find_data = (WIN32_FIND_DATA*)MALLOCATE(sizeof(WIN32_FIND_DATA));
// Tack on wildcard needed by FindFirstFile.
- int check = sprintf(dh->path, "%s\\*", dir);
- if (check < 0) { CFCUtil_die("sprintf failed"); }
+ sprintf(dh->path, "%s\\*", dir);
dh->handle = FindFirstFile(dh->path, dh->find_data);
if (dh->handle == INVALID_HANDLE_VALUE) {
Modified: incubator/lucy/trunk/clownfish/src/CFCMethod.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCMethod.c?rev=1139047&r1=1139046&r2=1139047&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCMethod.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCMethod.c Thu Jun 23 19:39:52 2011
@@ -134,11 +134,8 @@ CFCMethod_init(CFCMethod *self, CFCParce
size_t amount = strlen(full_func_sym) + sizeof("_OVERRIDE") + 1;
self->full_callback_sym = (char*)MALLOCATE(amount);
self->full_override_sym = (char*)MALLOCATE(amount);
- int check = sprintf(self->full_callback_sym, "%s_CALLBACK",
- full_func_sym);
- if (check < 0) { croak("sprintf failed"); }
- check = sprintf(self->full_override_sym, "%s_OVERRIDE", full_func_sym);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(self->full_callback_sym, "%s_CALLBACK", full_func_sym);
+ sprintf(self->full_override_sym, "%s_OVERRIDE", full_func_sym);
// Assume that this method is novel until we discover when applying
// inheritance that it was overridden.
@@ -249,8 +246,7 @@ CFCMethod_short_method_sym(CFCMethod *se
CFCUTIL_NULL_CHECK(invoker);
size_t needed = strlen(invoker) + 1 + strlen(self->macro_sym) + 1;
if (buf_size >= needed) {
- int check = sprintf(buf, "%s_%s", invoker, self->macro_sym);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(buf, "%s_%s", invoker, self->macro_sym);
}
return needed;
}
@@ -266,8 +262,7 @@ CFCMethod_full_method_sym(CFCMethod *sel
+ strlen(self->macro_sym)
+ 1;
if (buf_size >= needed) {
- int check = sprintf(buf, "%s%s_%s", Prefix, invoker, self->macro_sym);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(buf, "%s%s_%s", Prefix, invoker, self->macro_sym);
}
return needed;
}
@@ -298,12 +293,10 @@ S_update_typedefs(CFCMethod *self, const
const char *prefix = CFCMethod_get_prefix(self);
size_t amount = strlen(short_sym) + 3;
self->short_typedef = (char*)MALLOCATE(amount);
- int check = sprintf(self->short_typedef, "%s_t", short_sym);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(self->short_typedef, "%s_t", short_sym);
amount += strlen(prefix);
self->full_typedef = (char*)MALLOCATE(amount);
- check = sprintf(self->full_typedef, "%s%s_t", prefix, short_sym);
- if (check < 0) { croak("sprintf failed"); }
+ sprintf(self->full_typedef, "%s%s_t", prefix, short_sym);
}
else {
self->short_typedef = NULL;