error: ASSERTION error added + migrated

src/error/exporterrors.cpp

@@ -288,7 +288,7 @@ static ostream & printKDBErrors (ostream & os, parse_t & p)
 		   << "		return;" << endl
 		   << "	}" << endl;
 	}
-	os << "	ELEKTRA_ADD_LOGICAL_WARNING (parentKey, \"Unkown warning code\");" << endl << "}" << endl << "" << endl;
+	os << "	ELEKTRA_ADD_ASSERTION_WARNING (parentKey, \"Unkown warning code\");" << endl << "}" << endl << "" << endl;
 	os << "static inline void elektraTriggerError (const char *nr, Key *parentKey, const char *message)" << endl << "{" << endl;
 	for (size_t i = 1; i < p.size (); ++i)
 	{
@@ -297,7 +297,7 @@ static ostream & printKDBErrors (ostream & os, parse_t & p)
 		   << "		return;" << endl
 		   << "	}" << endl;
 	}
-	os << "	ELEKTRA_SET_LOGICAL_ERROR (parentKey, \"Unkown error code\");" << endl << "}" << endl;
+	os << "	ELEKTRA_SET_ASSERTION_ERROR (parentKey, \"Unkown error code\");" << endl << "}" << endl;
 
 	os << "#endif" << endl;
 	return os;

src/error/specification

@@ -27,9 +27,9 @@ number:C01300
 description:Installation
 macro:INSTALLATION
 
-number:C01400
-description:Logical
-macro:LOGICAL
+number:C01410
+description:Assertion
+macro:ASSERTION
 
 number:C01420
 description:Interface

src/libs/elektra/kdb.c

@@ -361,7 +361,7 @@ KDB * kdbOpen (Key * errorKey)
 	keySetString (errorKey, "kdbOpen(): mountModules");
 	if (mountModules (handle, handle->modules, errorKey) == -1)
 	{
-		ELEKTRA_ADD_LOGICAL_WARNING (errorKey, "Mounting modules did not work");
+		ELEKTRA_ADD_ASSERTION_WARNING (errorKey, "Mounting modules did not work");
 	}
 
 	keySetName (errorKey, keyName (initialParent));
@@ -1303,7 +1303,7 @@ static void elektraSetCommit (Split * split, Key * parentKey)
 
 			if (ret == -1)
 			{
-				ELEKTRA_ADD_LOGICAL_WARNINGF (parentKey, "Error during commit. This means backend is broken: %s",
+				ELEKTRA_ADD_ASSERTION_WARNINGF (parentKey, "Error during commit. This means backend is broken: %s",
 							      keyName (backend->mountpoint));
 			}
 		}
@@ -1335,7 +1335,7 @@ static void elektraSetRollback (Split * split, Key * parentKey)
 
 			if (ret == -1)
 			{
-				ELEKTRA_ADD_LOGICAL_WARNINGF (parentKey, "Error during rollback. This means backend is broken: %s",
+				ELEKTRA_ADD_ASSERTION_WARNINGF (parentKey, "Error during rollback. This means backend is broken: %s",
 							      keyName (backend->mountpoint));
 			}
 		}
@@ -1493,7 +1493,7 @@ int kdbSet (KDB * handle, KeySet * ks, Key * parentKey)
 		if (syncstate < 0) clearError (parentKey); // clear previous error to set new one
 		if (syncstate == -1)
 		{
-			ELEKTRA_SET_LOGICAL_ERROR (parentKey, "Assert failed: invalid namespace");
+			ELEKTRA_SET_ASSERTION_ERROR (parentKey, "Assert failed: invalid namespace");
 			ELEKTRA_LOG ("syncstate == -1");
 		}
 		else if (syncstate < -1)
@@ -1575,7 +1575,7 @@ int kdbSet (KDB * handle, KeySet * ks, Key * parentKey)
 		Key * found = ksLookup (ks, errorKey, 0);
 		if (!found)
 		{
-			ELEKTRA_ADD_LOGICAL_WARNINGF (parentKey, "Error key %s not found in keyset even though it was found before",
+			ELEKTRA_ADD_ASSERTION_WARNINGF (parentKey, "Error key %s not found in keyset even though it was found before",
 						      keyName (errorKey));
 		}
 	}

src/libs/elektra/plugin.c

@@ -210,7 +210,7 @@ int elektraProcessPlugins (Plugin ** plugins, KeySet * modules, KeySet * referen
 				Key * lookup = ksLookup (referencePlugins, keyNew (referenceName, KEY_END), KDB_O_DEL);
 				if (!lookup)
 				{
-					ELEKTRA_ADD_LOGICAL_WARNINGF (errorKey, "Could not reference back to plugin %s", referenceName);
+					ELEKTRA_ADD_ASSERTION_WARNINGF (errorKey, "Could not reference back to plugin %s", referenceName);
 					/* Getting a reference plugin at a previous stage did not work.
 					Note that this check is necessary, because loading the plugin could
 					fail for example at errorplugins and at a later point, for example

src/plugins/crypto/botan_operations.cpp

@@ -90,7 +90,7 @@ static int getKeyIvForEncryption (KeySet * config, Key * errorKey, Key * masterK
 	catch (std::exception const & e)
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Failed to create a cryptographic key for encryption because: %s", e.what ());
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Failed to create a cryptographic key for encryption because: %s", e.what ());
 		return -1;
 	}
 }
@@ -141,7 +141,7 @@ static int getKeyIvForDecryption (KeySet * config, Key * errorKey, Key * masterK
 	catch (std::exception const & e)
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Failed to restore the cryptographic key for decryption because: %s", e.what ());
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Failed to restore the cryptographic key for decryption because: %s", e.what ());
 		return -1;
 	}
 }
@@ -311,7 +311,7 @@ int elektraCryptoBotanDecrypt (KeySet * pluginConfig, Key * k, Key * errorKey, K
 	catch (std::exception const & e)
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Decryption failed because: %s", e.what ());
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Decryption failed because: %s", e.what ());
 		return -1; // failure
 	}
 
@@ -342,7 +342,7 @@ char * elektraCryptoBotanCreateRandomString (Key * errorKey, const kdb_unsigned_
 	catch (std::exception const & e)
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Failed to generate random string because: %s", e.what ());
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Failed to generate random string because: %s", e.what ());
 		return 0;
 	}
 }

src/plugins/crypto/gcrypt_operations.c

@@ -72,7 +72,7 @@ static int getKeyIvForEncryption (KeySet * config, Key * errorKey, Key * masterK
 					 sizeof (salt), iterations, KEY_BUFFER_SIZE, keyBuffer)))
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Failed to create a cryptographic key for encryption because: %s",
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Failed to create a cryptographic key for encryption because: %s",
 					    gcry_strerror (gcry_err));
 		return -1;
 	}
@@ -115,7 +115,7 @@ static int getKeyIvForDecryption (KeySet * config, Key * errorKey, Key * masterK
 	if ((gcry_err = gcry_kdf_derive (keyValue (masterKey), keyGetValueSize (masterKey), GCRY_KDF_PBKDF2, GCRY_MD_SHA512, saltBuffer,
 					 saltBufferLen, iterations, KEY_BUFFER_SIZE, keyBuffer)))
 	{
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Failed to restore the cryptographic key for decryption because: %s",
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Failed to restore the cryptographic key for decryption because: %s",
 					    gcry_strerror (gcry_err));
 		return -1;
 	}
@@ -235,7 +235,7 @@ int elektraCryptoGcryHandleCreate (elektraCryptoHandle ** handle, KeySet * confi
 	memset (keyBuffer, 0, sizeof (keyBuffer));
 	memset (ivBuffer, 0, sizeof (ivBuffer));
 	// TODO: Correct?
-	ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Failed to create handle because: %s", gcry_strerror (gcry_err));
+	ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Failed to create handle because: %s", gcry_strerror (gcry_err));
 	gcry_cipher_close (**handle);
 	elektraFree (*handle);
 	(*handle) = NULL;
@@ -390,7 +390,7 @@ int elektraCryptoGcryDecrypt (elektraCryptoHandle * handle, Key * k, Key * error
 	gcry_err = gcry_cipher_decrypt (*handle, output, payloadLen, NULL, 0);
 	if (gcry_err != 0)
 	{
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Decryption failed because: %s", gcry_strerror (gcry_err));
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Decryption failed because: %s", gcry_strerror (gcry_err));
 		memset (output, 0, payloadLen);
 		elektraFree (output);
 		return -1;

src/plugins/crypto/helper.c

@@ -113,15 +113,14 @@ int ELEKTRA_PLUGIN_FUNCTION (getSaltFromMetakey) (Key * errorKey, Key * k, kdb_o
 	if (!meta)
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "missing salt as metakey %s in key %s", ELEKTRA_CRYPTO_META_SALT, keyName (k));
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "missing salt as metakey %s in key %s", ELEKTRA_CRYPTO_META_SALT, keyName (k));
 		return -1;
 	}
 
 	int result = ELEKTRA_PLUGIN_FUNCTION (base64Decode) (errorKey, keyString (meta), salt, &saltLenInternal);
 	if (result == -1)
 	{
-		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERROR (errorKey, "Salt was not stored Base64 encoded.");
+		ELEKTRA_SET_SEMANTIC_VALIDATION_ERROR (errorKey, "Salt was not stored Base64 encoded.");
 		return -1;
 	}
 	else if (result == -2)
@@ -157,7 +156,7 @@ int ELEKTRA_PLUGIN_FUNCTION (getSaltFromPayload) (Key * errorKey, Key * k, kdb_o
 	if ((size_t) payloadLen < sizeof (size_t) || payloadLen < 0)
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "payload is too small to contain a salt (payload length is: %zu)", payloadLen);
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "payload is too small to contain a salt (payload length is: %zu)", payloadLen);
 		if (salt) *salt = NULL;
 		return -1;
 	}
@@ -174,7 +173,7 @@ int ELEKTRA_PLUGIN_FUNCTION (getSaltFromPayload) (Key * errorKey, Key * k, kdb_o
 	if (restoredSaltLen < 1 || restoredSaltLen > (payloadLen - headerLen))
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "restored salt has invalid length of %u (payload length is: %zu)", restoredSaltLen,
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "restored salt has invalid length of %u (payload length is: %zu)", restoredSaltLen,
 					    payloadLen);
 		if (salt) *salt = NULL;
 		return -1;

src/plugins/crypto/openssl_operations.c

@@ -61,7 +61,7 @@ static int getKeyIvForEncryption (KeySet * config, Key * errorKey, Key * masterK
 	if (!RAND_bytes (salt, ELEKTRA_CRYPTO_DEFAULT_SALT_LEN - 1))
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "failed to generate random salt with error code %lu", ERR_get_error ());
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "failed to generate random salt with error code %lu", ERR_get_error ());
 		pthread_mutex_unlock (&mutex_ssl);
 		return -1;
 	}
@@ -89,7 +89,7 @@ static int getKeyIvForEncryption (KeySet * config, Key * errorKey, Key * masterK
 				     keyBuffer))
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey,
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey,
 					    "Failed to create a cryptographic key for encryption. Libcrypto returned error code: %lu",
 					    ERR_get_error ());
 		pthread_mutex_unlock (&mutex_ssl);
@@ -136,7 +136,7 @@ static int getKeyIvForDecryption (KeySet * config, Key * errorKey, Key * masterK
 				     KEY_BUFFER_SIZE, keyBuffer))
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (
+		ELEKTRA_SET_ASSERTION_ERRORF (
 			errorKey, "Failed to restore the cryptographic key for decryption. Libcrypto returned the error code: %lu",
 			ERR_get_error ());
 		pthread_mutex_unlock (&mutex_ssl);
@@ -202,7 +202,7 @@ int elektraCryptoOpenSSLHandleCreate (elektraCryptoHandle ** handle, KeySet * co
 	{
 		keyDel (key);
 		keyDel (iv);
-		ELEKTRA_SET_LOGICAL_ERROR (errorKey, "Failed to create handle! Invalid key length.");
+		ELEKTRA_SET_ASSERTION_ERROR (errorKey, "Failed to create handle! Invalid key length.");
 		return -1;
 	}
 
@@ -211,7 +211,7 @@ int elektraCryptoOpenSSLHandleCreate (elektraCryptoHandle ** handle, KeySet * co
 		keyDel (key);
 		keyDel (iv);
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERROR (errorKey, "Failed to create handle! Invalid IV length.");
+		ELEKTRA_SET_ASSERTION_ERROR (errorKey, "Failed to create handle! Invalid IV length.");
 		return -1;
 	}
 
@@ -244,7 +244,7 @@ int elektraCryptoOpenSSLHandleCreate (elektraCryptoHandle ** handle, KeySet * co
 	if (ERR_peek_error ())
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Failed to create handle! libcrypto error code was: %lu", ERR_get_error ());
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Failed to create handle! libcrypto error code was: %lu", ERR_get_error ());
 		elektraFree (*handle);
 		*handle = NULL;
 		pthread_mutex_unlock (&mutex_ssl);
@@ -509,7 +509,7 @@ int elektraCryptoOpenSSLDecrypt (elektraCryptoHandle * handle, Key * k, Key * er
 
 error:
 	// TODO: Correct?
-	ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Decryption error! libcrypto error code was: %lu", ERR_get_error ());
+	ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Decryption error! libcrypto error code was: %lu", ERR_get_error ());
 	BIO_free_all (decrypted);
 	pthread_mutex_unlock (&mutex_ssl);
 	return -1;
@@ -529,7 +529,7 @@ char * elektraCryptoOpenSSLCreateRandomString (Key * errorKey, const kdb_unsigne
 	if (!RAND_bytes (buffer, length))
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Failed to generate random string. libcrypto error code was: %lu", ERR_get_error ());
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Failed to generate random string. libcrypto error code was: %lu", ERR_get_error ());
 		pthread_mutex_unlock (&mutex_ssl);
 		return NULL;
 	}

src/plugins/fcrypt/fcrypt.c

@@ -244,7 +244,7 @@ static int fcryptGpgCallAndCleanup (Key * parentKey, KeySet * pluginConfig, char
 		shredTemporaryFile (tmpFileFd, parentKey);
 		if (unlink (tmpFile))
 		{
-			ELEKTRA_ADD_LOGICAL_WARNINGF (
+			ELEKTRA_ADD_ASSERTION_WARNINGF (
 				parentKey,
 				"Failed to unlink a temporary file. WARNING: unencrypted data may leak! Please try to delete "
 				"the file manually. Affected file: %s, error description: %s",
@@ -483,7 +483,7 @@ static int fcryptDecrypt (KeySet * pluginConfig, Key * parentKey, fcryptState *
 		shredTemporaryFile (tmpFileFd, parentKey);
 		if (unlink (tmpFile))
 		{
-			ELEKTRA_ADD_LOGICAL_WARNINGF (
+			ELEKTRA_ADD_ASSERTION_WARNINGF (
 				parentKey,
 				"Failed to unlink a temporary file. WARNING: unencrypted data may leak! Please try to delete "
 				"the file manually. Affected file: %s, error description: %s",
@@ -585,7 +585,7 @@ int ELEKTRA_PLUGIN_FUNCTION (get) (Plugin * handle, KeySet * ks ELEKTRA_UNUSED,
 		}
 		else
 		{
-			ELEKTRA_SET_LOGICAL_ERROR (parentKey, "The path to the original file is lost.");
+			ELEKTRA_SET_ASSERTION_ERROR (parentKey, "The path to the original file is lost.");
 			// clean-up is performed by kdb close
 			return -1;
 		}
@@ -600,7 +600,7 @@ int ELEKTRA_PLUGIN_FUNCTION (get) (Plugin * handle, KeySet * ks ELEKTRA_UNUSED,
 			s->tmpFileFd = -1;
 			if (unlink (s->tmpFilePath))
 			{
-				ELEKTRA_ADD_LOGICAL_WARNINGF (
+				ELEKTRA_ADD_ASSERTION_WARNINGF (
 					parentKey,
 					"Failed to unlink a temporary file. WARNING: unencrypted data may leak! Please try "
 					"to delete the file manually. Affected file: %s, error description: %s",

src/plugins/gpgme/gpgme.c

@@ -154,7 +154,7 @@ static gpgme_key_t * extractRecipientFromPluginConfig (KeySet * config, Key * er
 		if (err)
 		{
 			// TODO: Correct?
-			ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Failed to receive the GPG key because: %s", gpgme_strerror (err));
+			ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Failed to receive the GPG key because: %s", gpgme_strerror (err));
 			elektraGpgmeKeylistFree (&list);
 			return NULL;
 		}
@@ -184,7 +184,7 @@ static gpgme_key_t * extractRecipientFromPluginConfig (KeySet * config, Key * er
 				if (err)
 				{
 					// TODO: Correct?
-					ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Failed to receive the GPG key because: %s",
+					ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Failed to receive the GPG key because: %s",
 								    gpgme_strerror (err));
 					elektraGpgmeKeylistFree (&list);
 					return NULL;
@@ -260,7 +260,7 @@ static int transferGpgmeDataToElektraKey (gpgme_data_t src, Key * dst, Key * err
 	readCount = gpgme_data_read (src, buffer, ciphertextLen);
 	if (readCount != ciphertextLen)
 	{
-		ELEKTRA_SET_LOGICAL_ERROR (errorKey, "An error during occurred during the data transfer.");
+		ELEKTRA_SET_ASSERTION_ERROR (errorKey, "An error during occurred during the data transfer.");
 		returnValue = -1; // failure
 		goto cleanup;
 	}
@@ -402,15 +402,15 @@ static int gpgEncrypt (Plugin * handle, KeySet * data, Key * errorKey)
 		if (err)
 		{
 			returnValue = -1;
-			ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
+			ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
 			goto cleanup;
 		}
 
 		err = gpgme_data_new (&ciphertext);
 		if (err)
 		{
 			returnValue = -1;
-			ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
+			ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
 			gpgme_data_release (input);
 			goto cleanup;
 		}
@@ -419,7 +419,7 @@ static int gpgEncrypt (Plugin * handle, KeySet * data, Key * errorKey)
 		if (err)
 		{
 			returnValue = -1;
-			ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
+			ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
 			gpgme_data_release (ciphertext);
 			gpgme_data_release (input);
 			goto cleanup;
@@ -505,15 +505,15 @@ static int gpgDecrypt (ELEKTRA_UNUSED Plugin * handle, KeySet * data, Key * erro
 		err = gpgme_data_new_from_mem (&ciphertext, keyValue (k), keyGetValueSize (k), 0);
 		if (err)
 		{
-			ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
+			ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
 			returnValue = -1;
 			goto cleanup;
 		}
 
 		err = gpgme_data_new (&plaintext);
 		if (err)
 		{
-			ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
+			ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
 			returnValue = -1;
 			gpgme_data_release (ciphertext);
 			goto cleanup;
@@ -522,7 +522,7 @@ static int gpgDecrypt (ELEKTRA_UNUSED Plugin * handle, KeySet * data, Key * erro
 		err = gpgme_op_decrypt (ctx, ciphertext, plaintext);
 		if (err)
 		{
-			ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
+			ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
 			returnValue = -1;
 			gpgme_data_release (plaintext);
 			gpgme_data_release (ciphertext);
@@ -561,7 +561,7 @@ int elektraGpgmeOpen (ELEKTRA_UNUSED Plugin * handle, ELEKTRA_UNUSED Key * error
 	err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
 	if (err)
 	{
-		ELEKTRA_SET_LOGICAL_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
+		ELEKTRA_SET_ASSERTION_ERRORF (errorKey, "Internal error: %s", gpgme_strerror (err));
 		return -1; // failure
 	}
 	return 1; // success

src/plugins/line/line.c

@@ -101,7 +101,7 @@ int elektraLineGet (Plugin * handle ELEKTRA_UNUSED, KeySet * returned, Key * par
 	if (ret == -1)
 	{
 		// TODO: Correct?
-		ELEKTRA_SET_PARSING_ERRORF (parentKey, "could not increment array from %s", keyName (ksTail (returned)));
+		ELEKTRA_SET_ASSERTION_ERRORF (parentKey, "could not increment array from %s", keyName (ksTail (returned)));
 		ret = -1;
 	}
 	else if (feof (fp) == 0)