pike.git/ src/ post_modules/ Nettle/ hash.cmod

2014-12-04

2014-12-04 19:26:00 by Martin Nilsson <nilsson@opera.com>

• b81a1dad883d72fe3cff9eef009a19368eed83fe (13 lines) (+6/-7) ^{[ Show | Annotate ]}
  Branch: bill/master_archive_support

mallocs nowdays return void*, so no need to case.

133:    Pike_error("Hash not properly initialized.\n");    NO_WIDE_STRING(in);    -  ctx = (void *)alloca(meta->context_size); +  ctx = alloca(meta->context_size);    if(!ctx)    SIMPLE_OUT_OF_MEMORY_ERROR("hash", meta->context_size);   
211:    if (!S_ISREG(st.st_mode))    Pike_error("Non-regular file.\n");    -  ctx = (void *)alloca(meta->context_size); +  ctx = alloca(meta->context_size);    if (!ctx)    SIMPLE_OUT_OF_MEMORY_ERROR("hash", meta->context_size);    -  read_buffer=(char *)malloc(8192); -  if (!read_buffer) -  SIMPLE_OUT_OF_MEMORY_ERROR("hash", 8192); +  read_buffer=xalloc(8192);       THREADS_ALLOW();    meta->init(ctx);
303:       password->flags |= STRING_CLEAR_ON_EXIT;    -  ctx = (void *)alloca(meta->context_size); +  ctx = alloca(meta->context_size);    if (!ctx)    SIMPLE_OUT_OF_MEMORY_ERROR("crypt_hash", meta->context_size);    -  abcbuf = (uint8_t *)alloca(meta->digest_size * 3); +  abcbuf = alloca(meta->digest_size * 3);    if (!abcbuf)    SIMPLE_OUT_OF_MEMORY_ERROR("crypt_hash", meta->digest_size * 3);